Git Workflows: Beware of merge conflicts, they bite you!

Transcript

2. Outline • Why do we need them? • What are they? • How do I use them? • Useful git commands
3. Why • Inefficient Release Process • Code conflicts • Scalability concerns
4. Git Workflow Git Workflow is a git branching model for teams that scales.
5. Git Workflow - Types • Git Flow • Github flow • Trunk-based flow • Space Git Flow
6. Git Flow - Main Branches main develop For production code only! Development code
7. Git Flow - Supporting Branches main develop Feature branches $ git checkout -b myfeature develop
8. Git Flow - Supporting Branches main develop feature branches $ git checkout -b release-1.0 develop release branches release branch for 1.0 release branch 1.1
9. main develop feature branches release branches release branch for 1.0 release branch 1.1 hotfixes
10. Useful git commands Git merge vs Git Rebase Both are used for incorporating changes from one branch to another!
11. Git merge vs Git Rebase git merge feature develop develop
12. Git merge Result develop New Commit
13. Git Rebase Result develop git checkout feature git rebase develop • No new merge commit • It results in a linear git history
14. Git Rebase - Interactive mode git checkout feature git rebase -i develop pick 33d5b7a Add paypal payment method #1 pick 9480b3d Fix something #2 pick 5c67e61 Add idea payment method #3 develop
15. Git Rebase - Interactive mode SQUASHING! pick 33d5b7a Add paypal payment method #1 fixup 9480b3d Fix something #2 pick 5c67e61 Add idea payment method #3 develop
16. Git Rebase The golden rule of git rebase is to never use it on public branches
17. Questions?