{"thread":{"id":"33447","subject":"Teaching rerere about existing merges","startedAt":"2013-04-09T14:18:26Z","lastAt":"2013-04-09T16:01:23Z","messageCount":4,"participants":["Jeremy Rosen","Jed Brown","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"213660","messageId":"504282025.1400346.1365517106800.JavaMail.root@openwide.fr","threadId":"33447","inReplyTo":null,"subject":"Teaching rerere about existing merges","fromName":"Jeremy Rosen","fromEmail":"jeremy.rosen@openwide.fr","sentAt":"2013-04-09T14:18:26Z","receivedAt":"2013-04-09T14:18:26Z","isPatch":false,"sender":{"key":"jeremy.rosen@openwide.fr","avatar":null},"body":"Hello everybody\n\nI have just discovered rerere which seems to be an awesome feature....\n\nunfortunately I have been merging and resolving conflicts on my repository\nfor quite some time and I will soon do a rebase that would greatly\ngain from using rerere...\n\nis there a way to \"teach\" rerere about existing merge commits, or do I \nhave to re-solve all the existing merge manually once ?\n\n    Regards\n\n    Jérémy Rosen\n\nfight key loggers : write some perl using vim\n"},{"id":"213661","messageId":"87k3ob7ndj.fsf@mcs.anl.gov","threadId":"33447","inReplyTo":"504282025.1400346.1365517106800.JavaMail.root@openwide.fr","subject":"Re: Teaching rerere about existing merges","fromName":"Jed Brown","fromEmail":"jed@59a2.org","sentAt":"2013-04-09T15:08:24Z","receivedAt":"2013-04-09T15:08:24Z","isPatch":false,"sender":{"key":"jed@59a2.org","avatar":"https://gravatar.com/avatar/1391d04d82555f9058a9fdf5eead233e909a48e40480db31fc554e7afeb301da?d=mp&s=160"},"body":"Jeremy Rosen <jeremy.rosen@openwide.fr> writes:\n\n> is there a way to \"teach\" rerere about existing merge commits, or do I \n> have to re-solve all the existing merge manually once ?\n\nSee src/contrib/rerere-train.sh and Junio's blog.\n\nhttp://git-blame.blogspot.com/2012/04/rebuilding-git-integration-environment.html\n"},{"id":"213664","messageId":"1905484131.1403079.1365520801804.JavaMail.root@openwide.fr","threadId":"33447","inReplyTo":"87k3ob7ndj.fsf@mcs.anl.gov","subject":"Re: Teaching rerere about existing merges","fromName":"Jeremy Rosen","fromEmail":"jeremy.rosen@openwide.fr","sentAt":"2013-04-09T15:20:01Z","receivedAt":"2013-04-09T15:20:01Z","isPatch":false,"sender":{"key":"jeremy.rosen@openwide.fr","avatar":null},"body":"thanks a lot, that solves my problem.\n\nI'm a bit suprised that it's not part of the git-rerere command but that's good enough for me...\n\n    Cordialement\n\n    Jérémy Rosen\n\nfight key loggers : write some perl using vim\n\n----- Mail original -----\n> Jeremy Rosen <jeremy.rosen@openwide.fr> writes:\n> \n> > is there a way to \"teach\" rerere about existing merge commits, or\n> > do I\n> > have to re-solve all the existing merge manually once ?\n> \n> See src/contrib/rerere-train.sh and Junio's blog.\n> \n> http://git-blame.blogspot.com/2012/04/rebuilding-git-integration-environment.html\n> \n"},{"id":"213667","messageId":"7vd2u3u20c.fsf@alter.siamese.dyndns.org","threadId":"33447","inReplyTo":"504282025.1400346.1365517106800.JavaMail.root@openwide.fr","subject":"Re: Teaching rerere about existing merges","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-09T16:01:23Z","receivedAt":"2013-04-09T16:01:23Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeremy Rosen <jeremy.rosen@openwide.fr> writes:\n\n> is there a way to \"teach\" rerere about existing merge commits, or do I \n> have to re-solve all the existing merge manually once ?\n\nThere is a tool that does the \"re-solve manually\" for you.\n\n$ git ls-files | grep rerere-train\ncontrib/rerere-train.sh\n\nIt uses your working tree to do its work, so you should first commit\nor stash whatever you are in the middle of doing before using it.\n"}]}