StackOverflow Questions for Tag: git-rerere

frasertweedale

Reputation: 5644

rebase - automatically continue if rerere resolved all conflicts

gitgit-rebasegit-rerere

Score: 29

Answers: 2

jozxyqk

Reputation: 17266

How can I see what "previous resolution" git applied?

gitmerge-conflict-resolutiongit-merge-conflictgit-rerere

Score: 4

Answers: 2

Kyle Heironimus

Reputation: 8041

Git workflow for avoiding lots of merge noise in the logs

gitgit-rerere

Score: 2

Answers: 1

Brondahl

Reputation: 8557

How can I teach `git-rerere` about the resolutions in an existing merge commit, with the least manual intervention

gitgit-mergegit-rerere

Score: 10

Answers: 3

psykx

Reputation: 293

How can I avoid fixing other peoples merges when doing a git rebase

gitgit-rebasegit-rerere

Score: 1

Answers: 0

A. K.

Reputation: 38156

How to prevent git from applying recorded changes during a git revert

gitgit-revertgit-rerere

Score: 0

Answers: 1

Greg Nisbet

Reputation: 6994

`git` get metrics on how often `rerere` resolutions are used

gitgit-rerere

Score: 1

Answers: 0

Ryan C. Thompson

Reputation: 42020

Are there any downsides to enabling git rerere?

gitmergegit-rerere

Score: 142

Answers: 5

Noa Yehezkel

Reputation: 508

When will Git resolve conflicts using a previous resolution and how can I disable it?

gitgit-rerere

Score: 7

Answers: 1

Xilexio

Reputation: 1238

Squashing first few dozens of git commits that contain merge commits

gitgit-mergegit-rebasegit-squashgit-rerere

Score: 2

Answers: 2

Campbell

Reputation: 725

git rerere does not auto-commit autoupdated merge resolutions

gitgit-rerere

Score: 22

Answers: 1

jozxyqk

Reputation: 17266

git says "No files need merging" immediately after a merge conflict

gitgit-rerere

Score: 4

Answers: 3

Brad

Reputation: 738

What is the "thisimage" in the rerere directory?

gitgit-rerere

Score: 2

Answers: 1

kevinmm

Reputation: 3376

Undo a git rerere resolution that was done in a rebase

gitgit-rebasegit-rerere

Score: 71

Answers: 2

davr

Reputation: 19137

Have git rerere automatically mark files as resolved?

gitmergeconflictgit-rerere

Score: 20

Answers: 1

Carlos Laspina

Reputation: 2231

What is git-rerere and how does it work?

gitversion-controlcontinuous-integrationgit-rerere

Score: 68

Answers: 2

Michael come lately

Reputation: 9333

Is there a reason Git ReReRe might not succeed?

gitgit-rerere

Score: 1

Answers: 0

Walt D

Reputation: 4721

How do I edit a Git commit that is hundreds of merges and merge conflicts into the past?

gitversion-controlgit-rerere

Score: 3

Answers: 3

Eyal Gerber

Reputation: 1657

How to record git merge conflicts and their resolutions but without automatically resolving conflicts?

gitgit-rerere

Score: 1

Answers: 1

Miral

Reputation: 13030

Why does git not automatically reapply conflict resolutions when performing a rebase-merges rebase?

gitgit-mergegit-rebasegit-rerere

Score: 6

Answers: 1

PreviousPage 1Next

StackOverflow Questions for Tag: git-rerere

rebase - automatically continue if rerere resolved all conflicts

How can I see what &quot;previous resolution&quot; git applied?

Git workflow for avoiding lots of merge noise in the logs

How can I teach `git-rerere` about the resolutions in an existing merge commit, with the least manual intervention

How can I avoid fixing other peoples merges when doing a git rebase

How to prevent git from applying recorded changes during a git revert

`git` get metrics on how often `rerere` resolutions are used

Are there any downsides to enabling git rerere?

When will Git resolve conflicts using a previous resolution and how can I disable it?

Squashing first few dozens of git commits that contain merge commits

git rerere does not auto-commit autoupdated merge resolutions

git says &quot;No files need merging&quot; immediately after a merge conflict

What is the &quot;thisimage&quot; in the rerere directory?

Undo a git rerere resolution that was done in a rebase

Have git rerere automatically mark files as resolved?

What is git-rerere and how does it work?

Is there a reason Git ReReRe might not succeed?

How do I edit a Git commit that is hundreds of merges and merge conflicts into the past?

How to record git merge conflicts and their resolutions but without automatically resolving conflicts?

Why does git not automatically reapply conflict resolutions when performing a rebase-merges rebase?

How can I see what "previous resolution" git applied?

git says "No files need merging" immediately after a merge conflict

What is the "thisimage" in the rerere directory?