Git Flow

Transcript

1. Git The Git-Flow Model Foivos Zakkak foivos.zakkak@manchester.ac.uk Except where otherwise noted, this presentation is licensed under the Creative Commons Attribution 4.0 International License. Third party marks and brands are the property of their respective holders.
2. Preamble Feel free to interrupt if you don’t understand something Please ask. There are no stupid questions! The slides are available at https://speakerdeck.com/zakkak/git-flow Apologies in advance if I inadvertently offend you in any way Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
3. Assumptions You know how to: create a new repository git init clone git clone <path.to.git.repository> pull git pull commit git add <file>; git commit push git push use branches git branch mybranch; git checkout mybranch Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
4. What Is This Talk About? The most popular Git branching model! Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
5. What is a Git branching model? A methodology defining: a number of standard branches when to create new branches when and how to merge branches when to create new tags Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
6. The Standard Branches master for production releases develop for “next release” development No coding on these branches only merges ©Vincent Driessen Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
7. Supporting Branches feature/* for new features release/* for new releases hotfix/* for fast/critical patches Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
8. Feature Branches ©Vincent Driessen Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
9. Feature Branches ©Vincent Driessen 1. git checkout develop -b feature/mynewfeature Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
10. Feature Branches ©Vincent Driessen 1. git checkout develop -b feature/mynewfeature 2. Code and git commit Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
11. Feature Branches ©Vincent Driessen 1. git checkout develop -b feature/mynewfeature 2. Code and git commit 3. git checkout develop Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
12. Feature Branches ©Vincent Driessen 1. git checkout develop -b feature/mynewfeature 2. Code and git commit 3. git checkout develop 4. git merge --no-ff feature/mynewfeature Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
13. Feature Branches ©Vincent Driessen 1. git checkout develop -b feature/mynewfeature 2. Code and git commit 3. git checkout develop 4. git merge --no-ff feature/mynewfeature 5. git branch -d feature/mynewfeature Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
14. Feature Branches ©Vincent Driessen 1. git checkout develop -b feature/mynewfeature 2. Code and git commit 3. git checkout develop 4. git merge --no-ff feature/mynewfeature 5. git branch -d feature/mynewfeature 6. git push Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
15. Release Branches ©Vincent Driessen Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
16. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
17. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
18. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit 3. git checkout master Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
19. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit 3. git checkout master 4. git merge --no-ff release/v2.1.0 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
20. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit 3. git checkout master 4. git merge --no-ff release/v2.1.0 5. git tag -a v2.1.0 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
21. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit 3. git checkout master 4. git merge --no-ff release/v2.1.0 5. git tag -a v2.1.0 6. git push --tags Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
22. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit 3. git checkout master 4. git merge --no-ff release/v2.1.0 5. git tag -a v2.1.0 6. git push --tags 7. git checkout develop Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
23. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit 3. git checkout master 4. git merge --no-ff release/v2.1.0 5. git tag -a v2.1.0 6. git push --tags 7. git checkout develop 8. git merge --no-ff release/v2.1.0 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
24. Release Branches ©Vincent Driessen 1. git checkout develop -b release/v2.1.0 2. Bump version to 2.1.0 and git commit 3. git checkout master 4. git merge --no-ff release/v2.1.0 5. git tag -a v2.1.0 6. git push --tags 7. git checkout develop 8. git merge --no-ff release/v2.1.0 9. git branch -d release/v2.1.0 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
25. Hotfix Branches ©Vincent Driessen Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
26. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
27. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
28. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
29. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit 4. git checkout master Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
30. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit 4. git checkout master 5. git merge --no-ff hotfix/v2.1.1 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
31. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit 4. git checkout master 5. git merge --no-ff hotfix/v2.1.1 6. git tag -a v2.1.1 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
32. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit 4. git checkout master 5. git merge --no-ff hotfix/v2.1.1 6. git tag -a v2.1.1 7. git checkout develop or release/vX.X.0 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
33. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit 4. git checkout master 5. git merge --no-ff hotfix/v2.1.1 6. git tag -a v2.1.1 7. git checkout develop or release/vX.X.0 8. git merge --no-ff hotfix/v2.1.1 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
34. Hotfix Branches ©Vincent Driessen 1. git checkout master -b hotfix/v2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit 4. git checkout master 5. git merge --no-ff hotfix/v2.1.1 6. git tag -a v2.1.1 7. git checkout develop or release/vX.X.0 8. git merge --no-ff hotfix/v2.1.1 9. git branch -d hotfix/v2.1.1 Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
35. ©Vincent Driessen
36. Making it less cumbersome Debian-based Linux apt-get install git-flow Mac OSX brew install git-flow-avh or port install git-flow-avh Others See https://github.com/nvie/gitflow/wiki/Installation Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
37. Initialize git flow init Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
38. Feature Branches ©Vincent Driessen 1. git flow feature start mynewfeature 2. Code and git commit 3. git flow feature finish --push Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
39. Feature Branches ©Vincent Driessen 1. git flow feature start mynewfeature 2. Code and git commit 3. git flow feature finish --push Shared feature branches: git flow feature publish coopfeature git flow feature pull origin coopfeature Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
40. Release Branches ©Vincent Driessen 1. git flow release start 2.1.0 2. Bump version to 2.1.0 and git commit 3. git flow release publish 2.1.0 4. Fix bugs (only) and git commit 5. git flow release finish 2.1.0 --push 6. git push --tags Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
41. Hotfix Branches ©Vincent Driessen 1. git flow hotfix start 2.1.1 2. Bump version to 2.1.1 and git commit 3. Apply hot fix and git commit 4. git flow hotfix finish 2.1.1 --push 5. git push --tags Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
42. What about code reviews? 1. git flow feature/release/hotfix start ID 2. Edit and git commit 3. git flow feature/release/hotfix publish ID 4. Open Pull/Merge Request on github/gitlab 5. When the Pull/Merge Request gets approved 6. git flow feature/release/hotfix finish --keepremote --push ID 7. git push --tags (for release and hotfix) 8. Delete branch from github merged pull request Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
43. Hint To avoid flags --keepremote --push ID : git config gitflow.feature.finish.keepremote true git config gitflow.feature.finish.push true git config gitflow.hotfix.finish.keepremote true git config gitflow.hotfix.finish.push true git config gitflow.release.finish.keepremote true git config gitflow.release.finish.push true Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
44. Acknowledgments Git-flow was first presented by Vincent Driessen in 2010. For the original post visit http://nvie.com/posts/a-successful-git-branching-model/ Git: The Git-Flow Model foivos.zakkak@manchester.ac.uk
45. Cheers! Git The Git-Flow Model Foivos Zakkak foivos.zakkak@manchester.ac.uk