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

Repeat Resolution Setup

A common complaint about rebase is that there are times when you may have to manually resolve the same conflicts over and over again. This is especially prevalent when you have a long-running feature branch, or even more likely, multiple feature branches that are being rebased onto main.

RERERE to the Rescue

The git rerere functionality is a bit of a hidden feature. The name stands for "reuse recorded resolution" and, as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can resolve it for you automatically.

In other words, if enabled, rerere will remember how you resolved a conflict (applies to rebasing but also merging) and will automatically apply that resolution the next time it sees the same conflict. Pretty neat, right?

Assignment

Create a new branch off of main called favs.
Create a new file called customers/favs.md with the following content:

# Favorite Customers
* Walter White, Heisenberg, Chemist

Commit that with a message starting with K:
Create a new branch from favs called favs2.
Switch back to main. Create a file called customers/favs.md with the following content:

# Favorite Customers
* Jesse Pinkman, Heisenberg's Assistant

Commit that with a message starting with L:.

To recap, you should now have:

main: commit L
favs: commit K
favs2: commit K

The changes from L and K naturally conflict.

Run and submit the CLI tests.