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

Alex Riesen [off-list ref] writes:

... 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
	$ git rerere ;# have rerere record the resolution