Git rerere
Upcoming SlideShare
Loading in...5
×
 

Git rerere

on

  • 718 views

 

Statistics

Views

Total Views
718
Views on SlideShare
718
Embed Views
0

Actions

Likes
0
Downloads
0
Comments
0

0 Embeds 0

No embeds

Accessibility

Categories

Upload Details

Uploaded via as Adobe PDF

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

Git rerere Git rerere Presentation Transcript

  • 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 Recorded preimage for hello.js ## rerere effect!!• ... resolve• $ git add . && git commit -mmerged
  • resolve conflict
  • conflict resolution
  • reuse resolution• $ git checkout i18n-world• $ git rebase master
  • reuse resolution• $ git add .• $ git rebase --continue
  • Solved rebasing