Rerere for repeated conflict resolution in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

🧠 Conceptual

intermediate

What does Git's rerere feature do?

Git has a feature called rerere. What is its main purpose?

A Automatically merges branches without any conflicts.

B Encrypts commit messages to secure the repository history.

C Automatically remembers how you resolved a conflict and reuses that resolution if the same conflict happens again.

D Deletes branches that have been merged to keep the repository clean.

💡 Hint

Think about how Git can help you avoid resolving the same conflict multiple times.

The rerere feature stands for 'reuse recorded resolution'. It helps by remembering how you fixed a conflict once and applying the same fix automatically if the same conflict appears again.

💻 Command Output

intermediate

Output of enabling rerere and resolving conflicts

You run these commands in a Git repository:

git config --global rerere.enabled true
git merge feature-branch

The merge causes conflicts. After you fix the conflicts and run git add and git commit, what will happen if you later merge the same conflicting changes again?

A Git will automatically apply the previous conflict resolution without asking.

B Git will show the same conflicts again and require manual resolution.

C Git will abort the merge due to repeated conflicts.

D Git will delete the conflicting files.

💡 Hint

Think about what enabling rerere does after you resolve conflicts once.

With rerere enabled, Git records how you resolved conflicts. When the same conflict happens again, Git applies the recorded resolution automatically.

❓ Troubleshoot

advanced

Why rerere might not reuse conflict resolutions?

You have rerere enabled, but Git does not reuse your previous conflict resolutions during a merge. What could be a reason?

A You forgot to stage the resolved files with <code>git add</code> before committing.

B The conflict content changed slightly, so Git cannot match it to the recorded resolution.

C You have not enabled rerere with <code>git config rerere.enabled true</code>.

D Git rerere only works on merge commits, not rebase.

💡 Hint

Consider how rerere matches conflicts to recorded resolutions.

Rerere matches conflicts by their exact content. If the conflict changes even a little, rerere cannot recognize it and won't reuse the resolution.

🔀 Workflow

advanced

Correct workflow to use rerere during a rebase

You want to use rerere to help resolve repeated conflicts during a git rebase. Which sequence of commands correctly uses rerere?

A Start rebase, enable rerere, abort rebase, then restart rebase.

B Start rebase, resolve conflicts, commit manually, then enable rerere.

C Enable rerere, start rebase, resolve conflicts, run <code>git commit</code> directly without staging, then continue rebase.

D Enable rerere, start rebase, resolve conflicts, stage files with <code>git add</code>, then run <code>git rebase --continue</code>.

💡 Hint

Think about when to enable rerere and how to continue a rebase after conflicts.

You must enable rerere before starting the rebase. After resolving conflicts, stage the files with git add and then run git rebase --continue to proceed.

✅ Best Practice

expert

Best practice for managing rerere data in a team

Your team uses rerere to handle repeated conflicts. What is the best practice regarding the rerere data directory (.git/rr-cache)?

A Do not commit or share the rerere data directory; each developer manages their own rerere cache locally.

B Commit the rerere data directory to the repository so everyone shares the same conflict resolutions.

C Delete the rerere data directory regularly to avoid conflicts.

D Disable rerere on all developer machines to prevent confusion.

💡 Hint

Consider how rerere data is stored and shared among team members.

The rerere cache is local to each repository and should not be committed or shared. Each developer manages their own conflict resolutions independently.