threads / discuss / 33447

Teaching rerere about existing merges

Subject: Teaching rerere about existing merges

## tl;dr

4 messages between Apr 9, 2013 and Apr 9, 2013.

replies: 3people: 3as markdown or json

Jeremy Rosen· Apr 9, 2013, 14:18 UTC · lore

Hello everybody

I have just discovered rerere which seems to be an awesome feature....

unfortunately I have been merging and resolving conflicts on my repository for quite some time and I will soon do a rebase that would greatly gain from using rerere...

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

    Regards

    Jérémy Rosen

fight key loggers : write some perl using vim

Jed Brown· Apr 9, 2013, 15:08 UTC · re: Jeremy Rosen · lore

Re: Teaching rerere about existing merges

Jeremy Rosen <jeremy.rosen@openwide.fr> 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

Jeremy Rosen· Apr 9, 2013, 15:20 UTC · re: Jed Brown · lore

Re: Teaching rerere about existing merges

thanks a lot, that solves my problem.

I'm a bit suprised that it's not part of the git-rerere command but that's good enough for me...

    Cordialement

    Jérémy Rosen

fight key loggers : write some perl using vim

----- Mail original -----

Show 10 quoted lines

> Jeremy Rosen <jeremy.rosen@openwide.fr> 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
>

Junio C Hamano· Apr 9, 2013, 16:01 UTC · re: Jeremy Rosen · lore

Re: Teaching rerere about existing merges

Jeremy Rosen <jeremy.rosen@openwide.fr> 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 ?

There is a tool that does the "re-solve manually" for you.

$ git ls-files | grep rerere-train contrib/rerere-train.sh

It uses your working tree to do its work, so you should first commit or stash whatever you are in the middle of doing before using it.