Coding new features¶
Start a new issue: (!) Issues on GitHub
git pull
Make sure you have the latest copy of master.git checkout -b I# master
Create the I# branch locally based upon the master branch.git push -u origin I#
Create the branch on the server.
Write code and push commits:
- Each commit message should begin with
Ref ##
to reference the issue number (i.e.Ref #1
to reference issue #1) git push
Push latest commits to the server.
- Each commit message should begin with
End a task: (from master)
git checkout master
Set master as the working branch locally.git branch -D I#
Delete I# locally. You no longer need it because everything is pushed to the server.git merge --no-ff origin/I#
Merge the task into master and preserving branch history. All changes in master will show up as a single commit keeping the log simpler. The complete commit history will be preserved in I#.git push
Push any changes to master to the server.git push origin :I#
Delete I# from the server. It will still remain in the history along with every individual commit to it that was pushed, but it won’t be cluttering up the workspace.