Making GIT Workflows Work - Branch to branch by Photis Patriotis

1. Branch to
Branch
Making GIT Workflows Work

2. Assumptions
● You’ve used GIT
● You’ve branched something
● You’ve merged something
● You’ve tagged something
● You’ve messed something up pretty badly

3. What is a
branch?

4. Why is GIT Workflow Important
● Communicate Releases
● Testing (Manual and Automated)
● Code reviews
● Hot Fixes
● Semantic Versioning
● Work as both a team and individuals

5. Base Branches
/develop
/master

6. Feature Branches
Pull Request
/develop
/feature/descriptive-name
/master

7. Tags / Versioning
v1.0.0 v1.1.0
/develop
/master
Testing

8. Hot Fix
Pull Request
/develop
/master
/hot-fix/descriptive-name
v1.3.0 v1.3.1

9. Release/Staging Branch
v2.0.0v1.3.0
/develop
/master
/release/v2.0.xTesting

10. Advanced Flows

11. Large Features / Epics
Pull Request + Code Walkthrough
Pull Request
/epic/descriptive-name/develop
/develop
/master
/epic/descriptive-name/sub-feature

12. Multiple Concentrations
/android/develop
/android/master
/ios/develop
/ios/master
/server/develop
/server/master
/master
server-v1.0.0
ios-v2.7.0
android-v3.3.0 android-v3.4.0
ios-v3.0.0
server-v1.1.0

13. Forking Repos
● Organic
● Role Based
● Many Implementations

14. Branch
Permissions

15. Resources
● gitflow
○ http://nvie.com/posts/a-successful-git-branching-model/
○ http://danielkummer.github.io/git-flow-cheatsheet/
● Distributed Workflows
○ http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows
○ https://www.atlassian.com/git/workflows
● Semantic Versioning
○ http://semver.org/