How to leverage git branches for clean and readable commit history.

1. Pimp my Git
Pragmatic Git workflow

2. Pulling the right way
Building a house

3. Multiple teams
One team builds the roof Another seeds grass on the yard

4. Conflictless cooperation
Oh, really?
git pull

5. Git problem #721
“pull” does merge by default (rebase is an option)

6. Merging smarter
git pull --rebase

7. Merge

8. Rebase

9. After rebase

10. Commandment
Thou shalt pull with --rebase option.

11. Merging even smarter
$ sudo gem install git-up

12. Building a house

13. My workflow
Create a private branch
and do some work.

14. In the meantime
Someone else started working on the project

15. Risk of conflict

16. Rebase before merge
On feature branch, rebase with master branch
git rebase master

17. Resolve conflict
Resolve conflict on your local branch
git add .
git rebase --continue

18. Merge with squash
git checkout master
git merge feature --squash
git commit

19. Why?
Clean history
Each work item == one commit
Do not trash log with checkpoint commits
Conflicts resolved early
Missing (unnecessary) granularity