Rerere for repeated conflict resolution in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does 'rerere' stand for in Git?

'rerere' stands for "reuse recorded resolution." It helps Git remember how you resolved conflicts before and apply the same fix automatically next time.

beginner

How do you enable rerere in Git?

You enable rerere by running the command: git config --global rerere.enabled true. This tells Git to start remembering conflict resolutions.

intermediate

What happens when Git rerere detects a conflict it has seen before?

Git automatically applies the previously recorded resolution to the conflict, saving you time and effort in fixing the same conflict again.

intermediate

Where does Git store the conflict resolutions recorded by rerere?

Git stores them in the .git/rr-cache directory inside your repository.

intermediate

Can rerere be used with merge and rebase operations?

Yes, rerere works with both merge and rebase to help automatically resolve conflicts you have fixed before.

What is the main purpose of Git rerere?

A To automatically commit changes

B To remember and reuse conflict resolutions

C To delete branches safely

D To speed up cloning repositories

Git rerere helps by remembering how you resolved conflicts before and reusing that resolution automatically.

How do you enable rerere in Git?

A git config --global rerere.enabled true

B git rerere enable

C git enable rerere

D git rerere start

The correct command is git config --global rerere.enabled true to enable rerere globally.

Where does Git store rerere conflict resolutions?

A .git/cache

B .git/conflicts

C .git/resolutions

D .git/rr-cache

Git stores rerere data in the .git/rr-cache directory.

Which Git operations benefit from rerere?

A Merge and rebase

B Clone and fetch

C Push and pull

D Init and status

Rerere helps during merge and rebase operations to reuse conflict resolutions.

If rerere is enabled, what happens when you face a conflict you've resolved before?

A Git ignores the conflict

B Git deletes the conflicting files

C Git applies the previous resolution automatically

D Git asks you to resolve it again manually

Git rerere applies the previously recorded resolution automatically to save time.

Explain how Git rerere helps with repeated conflict resolution.

Think about how you might not want to fix the same problem twice.

Describe the steps to enable and use rerere in your Git workflow.

Start with the configuration, then what happens during conflict.