Git branching strategy

Slides from an internal presentation for new staff

Transcript

1. Git branching strategy
2. git checkout -b offline Creates a new branch called “offline” branching off from the current branch
3. git checkout dev Moves to an existing branch called “dev”
4. git branch -m watch clock Renames a branch called “watch” to “clock”
5. git branch -m develop Renames the current branch to “develop”
6. git branch -d develop Deletes the branch called “develop”
7. git merge --no-ff aria Merges the branch called “aria” into the current branch
8. git checkout -t origin/staging Create a new branch called “staging” that tracks the remote branch called “staging”
10. Feature branches Release branches Hotfix branches
12. git checkout -b <feature>
14. git checkout dev git merge --no-ff <feature>
16. git checkout staging git merge --no-ff dev
17. Feature branches Release branches Hotfix branches
19. git checkout -b release-2.2.0
20. README.md CHANGELOG.md
23. git checkout master git merge --no-ff release-2.2.0 git tag 2.2.0
24. git push origin master 2.2.0
25. Feature branches Release branches Hotfix branches
27. git checkout -b hotfix-2.2.1
28. README.md CHANGELOG.md
30. git checkout -t origin/staging Create a new branch called “staging” that tracks the remote branch called “staging”
31. git push -u origin staging Push a local branch called “staging” to remote