Re: [PATCH 00/12] Towards a better merge resolution support

Alex Riesen [off-list ref] writes:

Junio C Hamano, Mon, Sep 01, 2008 12:38:25 +0200:

quoted

Alex Riesen [off-list ref] writes:

quoted

... IOW, copy the commit
resolution from some other merge commit. Maybe can be a way to use
rerere mechanism with that?

If you know which merge I did you want to steal from, you can prime your
rerere database by pretending to be me, doing the merge.  Something like:

	$ git checkout $merge^1 ;# detach to the parent of merge
        $ git merge $merge^2 ;# pretend you were me to redo it
        $ git diff -R $merge | git apply --index ;# and get what I did

I ended up using

I think the last step should be "git read-tree --reset -u $merge" if we
really want the minimum  sequence.