When merging branches in a version control system, a merge conflict might arise. This tag is for questions about how such conflicts can be resolved.

- Stackoverflow.com Wiki
1 articles, 0 books.

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 automatically resolve it for you.