undefined | Better HN

0 pointswakawaka281y ago0 comments

You don't have to do anything besides turning it on. If a conflict has been resolved before, somehow it remembers that and applies the fix. The only pitfall I've seen is if you fix the conflict erroneously, it will remember that too.

0 comments

PaulDavisThe1st1y ago

Yes, my general rule of thumb as a rerere user and devotee is to at the very least do a test build before git-add'ing your resolved files. You won't catch logical errors, but you will catch syntactical issues that came up during conflict resolution. It helps, a bit.

mplanchard1y ago

If you accidentally record an incorrect resolution, you can also run `git rerere clear` to clear the cache, or `git rere forget <path>` to forget resolutions just for a particular file.

PaulDavisThe1st1y ago

Yeah, I learned about this last weekend, after mistakenly trying to rebase a repo where we generally merge.

I don't think that rerere offers fine grained enough control over "forgetting". What I needed (until I realized my mistake) was a way to clear any memory of a resolution for the current conflict in path.

j / k navigate · click thread line to collapse

0 pointswakawaka281y ago0 comments

0 comments

PaulDavisThe1st1y ago

mplanchard1y ago

If you accidentally record an incorrect resolution, you can also run `git rerere clear` to clear the cache, or `git rere forget <path>` to forget resolutions just for a particular file.

PaulDavisThe1st1y ago

Yeah, I learned about this last weekend, after mistakenly trying to rebase a repo where we generally merge.

j / k navigate · click thread line to collapse