1. git rerere
Reuse Recorded Resolution
@pismute | pete@weaveus | github.com/pismute

2. Enable rerere
$ git config --global rerere.enabled 1

3. Conflict Branches

5. resolve conflict
• $ git checkout master
• $ git checkout HEAD^0 ## detached
• $ git merge i18n-world
• > conflict, but Recorded preimage for 'hello.js' ## rerere effect!!
• ... resolve
• $ git add . && git commit -m'merged'

6. resolve conflict

7. conflict resolution

8. reuse resolution
• $ git checkout i18n-world
• $ git rebase master

9. reuse resolution
• $ git add .
• $ git rebase --continue

10. Solved rebasing