git rerere         Reuse Recorded Resolution@pismute | pete@weaveus | github.com/pismute
Enable rerere$ git config --global rerere.enabled 1
Conflict Branches
resolve conflict• $ git checkout master• $ git checkout HEAD^0 ## detached• $ git merge i18n-world •   > conflict, but Recor...
resolve conflict
conflict resolution
reuse resolution•   $ git checkout i18n-world•   $ git rebase master
reuse resolution•   $ git add .•   $ git rebase --continue
Solved rebasing
Git rerere
Upcoming SlideShare
Loading in …5
×

Git rerere

646 views
461 views

Published on

0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
646
On SlideShare
0
From Embeds
0
Number of Embeds
17
Actions
Shares
0
Downloads
1
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git rerere

  1. 1. git rerere Reuse Recorded Resolution@pismute | pete@weaveus | github.com/pismute
  2. 2. Enable rerere$ git config --global rerere.enabled 1
  3. 3. Conflict Branches
  4. 4. 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 -mmerged
  5. 5. resolve conflict
  6. 6. conflict resolution
  7. 7. reuse resolution• $ git checkout i18n-world• $ git rebase master
  8. 8. reuse resolution• $ git add .• $ git rebase --continue
  9. 9. Solved rebasing

×