Skip to content

Git workflow

Jump to bottom Edit New page
Kor de Jong edited this page Jan 14, 2015 · 2 revisions
  • Create a branch for each issue. Put the id of the issue in the name of the branch, eg: issue/gh1.
  • Keep branches local and merge them after issues are resolved. Use git merge --no-ff <branch> to merge a branch. This creates nice merge bubbles, which reference the number of the issue they fix.
  • Push the updated master to Github. In general, don't push topic branches to Github. Sometimes you have to, when branches can't be synchronised directly (machines can't access see each other).
Add a custom footer
Add a custom sidebar
Clone this wiki locally