Git branching strategy

git checkout -b offline Creates a new branch called “ofﬂine”
branching off from the current branch

git checkout dev Moves to an existing branch called “dev”

git branch -m watch clock Renames a branch called “watch”
to “clock”

git branch -m develop Renames the current branch to “develop”

git branch -d develop Deletes the branch called “develop”

git merge --no-ff aria Merges the branch called “aria” into
the current branch

git checkout -t origin/staging Create a new branch called “staging”
that tracks the remote branch called “staging”

Feature branches Release branches Hotﬁx branches

git checkout -b <feature>

git checkout dev git merge --no-ff <feature>

git checkout staging git merge --no-ff dev

git checkout -b release-2.2.0

README.md CHANGELOG.md

git checkout master git merge --no-ff release-2.2.0 git tag 2.2.0

git push origin master 2.2.0

git checkout -b hotfix-2.2.1

README.md CHANGELOG.md

git checkout -t origin/staging Create a new branch called “staging”
that tracks the remote branch called “staging”

git push -u origin staging Push a local branch called
“staging” to remote

Derek Johnson