Subject: Re: Teaching rerere about existing merges

From: Jed Brown <[email-masked]>
Date: Tue, 09 Apr 2013 10:08:24 -0500

Jeremy Rosen <[email-masked]> writes:

> is there a way to "teach" rerere about existing merge commits, or do I 
> have to re-solve all the existing merge manually once ?

See src/contrib/rerere-train.sh and Junio's blog.

http://git-blame.blogspot.com/2012/04/rebuilding-git-integration-environment.html