Vincent van Ravesteijn <vfr@xxxxxxx> writes:
> Would it be a useful addition to have a command 'git rerere edit
> <path> <commit>' ?
>
> This would allow the user to edit the conflict resolution which was
> used in a certain commit (merge, rebase.. ).
>
> Now I tend to grep in the .git/rr-cache directory, because I don't
> want to do 'git rerere forget' as this would require me to refix more
> resolution than needed.
I haven't find it necessary in practice, as the re-fix for me
typically would go like this:
$ git merge other-branch
... rerere kicks in; eyeball the results
... ah, my earlier resolution is no longer correct
$ edit $the_path
... test the result of manual edit in the context of the merged whole
... and be satisified
$ git rerere forget $the_path
$ git add $the_path
$ git commit
... rerere records the updated resolution
What scenario do you have in mind that you would need to re-fix more
resolution than you need?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html