Remove recorded conflict-resolution data.
Section: Rerere and Repeated Conflict Resolution
Clear rerere state
bash
bash
git rerere clearExplanation
Helpful if rerere recorded an incorrect or unwanted resolution pattern.
Learn the surrounding workflow
Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.
Related commands
Same sheet · prioritizing Rerere and Repeated Conflict Resolution
Show rerere diff
Inspect what rerere has recorded for conflict resolutions.
Stash unstaged changes only
Keep staged changes in the index and stash the rest.