Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: added Development workflow (draft)

...

MFX python git repository
local/reg/g/pcds/pyps/apps/hutch-python/mfx
remotehttps://github.com/pcdshub/mfx


Development workflow

First you need to have a local version of the repository and checkout the run21 branch

Code Block
git clone git@github.com:pcdshub/mfx.git # download repo locally from remote
git fetch --all                          # optional, just to be sure you can checkout the remote branch run21
git checkout run21                       # now you're working on branch run21

2. Every time you start working on implementing a feature:

Code Block
git checkout run21 # <= just to be sure
git pull # or git pull origin run21 to be sure
git checkout -b my-new-feature # do work in your own branch
... edit stuff ...
git add file1.py file2.py ... # add the files you have edited
git commit -m "new feature! I've added this and that in file1 and file2" # some info about what was done is always helpful
git push origin my-new-feature # this will create your my-new-feature branch on the remote repo (on GitHub)
... create a Pull Request from the GitHub webpage and ask someone to review it before merging into run21