This lesson's interactive features are locked, please to keep using them

RERERE

Let's see some conflicts!

Assignment

Enable the rerere feature by running the following command within your repo:

git config set --local rerere.enabled true

Switch to favs and rebase it onto main. You should see something like this:

wagslane@MacBook-Pro-2 megacorp % git rebase main
Auto-merging customers/favs.md
CONFLICT (add/add): Merge conflict in customers/favs.md
error: could not apply ad9b194... K
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Recorded preimage for 'customers/favs.md' # <--- THIS LINE HERE
Could not apply ad9b194... K

Notice how it's recording what we're doing as we resolve the conflict? This is the rerere feature in action!

Accept "both" changes for the conflict, which should result in a file like this:

# Favorite Customers
* Jesse Pinkman, Heisenberg's Assistant
* Walter White, Heisenberg, Chemist

Stage and continue the rebase. Leave the commit message as-is (K: ...). Note that git may automatically open a file on your editor in which you can edit the commit message, simply save and close to continue. When you're done you should see something like this:

wagslane@MacBook-Pro-2 megacorp % git add .
wagslane@MacBook-Pro-2 megacorp % git rebase --continue
Recorded resolution for 'customers/favs.md'. # <--- THIS LINE HERE
[detached HEAD cbf38e9] J
 1 file changed, 1 insertion(+)
Successfully rebased and updated refs/heads/favs.

Notice that Git is remembering how we resolved the conflict!

Finally, switch to the favs2 branch and rebase it onto main. It should auto-resolve the conflict and print a message like this:

wagslane@MacBook-Pro-2 megacorp % git rebase main
Auto-merging customers/favs.md
CONFLICT (add/add): Merge conflict in customers/favs.md
error: could not apply ad9b194... K
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Resolved 'customers/favs.md' using previous resolution. # <--- THIS LINE HERE
Could not apply ad9b194... K

Stage the changes and continue the rebase, leaving the commit message as-is (K: ...).

Run and submit the CLI tests.

Tips

If you mess up and need to repeat parts of this step, you can clear the rerere cache with this command from the root of your repo:

rm -rf .git/rr-cache