HiveBrain v1.2.0
Get Started
← Back to all entries
snippetbashTip

git rerere — Reuse fixes for merge conflicts. More information: <https://git-scm.com/docs/git-rerere>.

Submitted by: @import:tldr-pages··
0
Viewed 0 times
clitldrgit rererecommand-line
fixescommandreuseconflictscligit rereremergefor

Problem

How to use the git rerere command: Reuse fixes for merge conflicts. More information: <https://git-scm.com/docs/git-rerere>.

Solution

git rerere — Reuse fixes for merge conflicts. More information: <https://git-scm.com/docs/git-rerere>.

Enable rerere globally:
git config --global rerere.enabled true


Forget a file's recorded resolution:
git rerere forget {{path/to/file}}


Check the status of recorded resolutions:
git rerere status

Code Snippets

Enable rerere globally

git config --global rerere.enabled true

Forget a file's recorded resolution

git rerere forget {{path/to/file}}

Check the status of recorded resolutions

git rerere status

Context

tldr-pages: common/git rerere

Revisions (0)

No revisions yet.