Your SlideShare is downloading. ×
0
Git rerere
Git rerere
Git rerere
Git rerere
Git rerere
Git rerere
Git rerere
Git rerere
Git rerere
Git rerere
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×
Saving this for later? Get the SlideShare app to save on your phone or tablet. Read anywhere, anytime – even offline.
Text the download link to your phone
Standard text messaging rates apply

Git rerere

321

Published on

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

  • Be the first to like this

No Downloads
Views
Total Views
321
On Slideshare
0
From Embeds
0
Number of Embeds
1
Actions
Shares
0
Downloads
1
Comments
0
Likes
0
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide

Transcript

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

×