Monthly Archives: September 2014

Git branching model

I found a good branching model for git.

$ git checkout -b myfeature develop
# Switched to a new branch "myfeature"

Do work on myfeature here, when finished:

$ git checkout develop
# Switched to branch 'develop'
$ git merge --no-ff myfeature
# Updating ea1b82a..05e9557
# (Summary of changes)
$ git branch -d myfeature
# Deleted branch myfeature (was 05e9557).
$ git push origin develop

However, I tend to work with two branches “develop” and “master”, rather than feature specific
branches. I do any changes to “develop”, before merging them to “master” when they are ready.