Redoing a merge for a particular file

Redoing a merge for a particular file

[Chris Packham]

Hi All,

I'm in the middle of merging to branches and I've screwed up my manual
merge, I've also got rerere enabled and I can't seem to get back into
a state to trigger git mergetool again.

  $ git merge topic
  ...
  $ git mergetool
  $ make
  error: foo.c ... oops screwed up that merge.

The merge wasn't too painful so I don't mind starting again.

  $ git reset --hard HEAD^
  HEAD is now at 59c6097 ...
  $ git merge topic
  Auto-merging foo.c
  CONFLICT (content): Merge conflict in foo.c
  Auto-merging bar.c
  CONFLICT (content): bar.c
  Auto-merging otherfile1.c
  Auto-merging otherfile2.c
  Auto-merging otherfile3.c
  Resolved 'foo.c' using previous resolution.
  Resolved 'bar.c' using previous resolution.
  Automatic merge failed; fix conflicts and then commit the result.
  $ git mergetool
  No files need merging

So rerere has remembered the bad resolution of foo.c.  But even if I
run 'git rerere clear' and repeat the above sequence I get the same
result. I seem to remember something like this coming up before.
Wasn't there an option added to checkout to allow us to recreate the
pre-merge state?

  $ git checkout --merge foo.c
  $ git mergetool
  No files need merging

I can manually fix the error and amend the merge commit I just thought
git should be able to give me some help. I could have sworn that
checkout --merge is the right thing to do. Sure enough the man page
says it is "When checking out paths from the index, this option lets
you recreate the conflicted merge in the specified paths." maybe this
is a bug?

Looking at git status I think checkout is working as advertised but
maybe the bug is with mergetool.

  $ git status
  # On branch master
  # Your branch is behind 'origin/master' by 1 commit, and can be
fast-forwarded.
  #
  # Changes to be committed:
  ....
  # Unmerged paths:
  #   (use "git add/rm <file>..." as appropriate to mark resolution)
  #
  #	both modified:      foo.c
  #

foo.c now does have conflict markers in it so I think it's crying out
to be re-merged I just can't convince mergetool to do it. Am I doing
something wrong?

Thanks,
Chris

P.S.
  $ git --version
  git version 1.7.5.4

Re: Redoing a merge for a particular file

[Jeff King]

On Fri, Jul 08, 2011 at 10:24:10AM +1200, Chris Packham wrote:

> I'm in the middle of merging to branches and I've screwed up my manual
> merge, I've also got rerere enabled and I can't seem to get back into
> a state to trigger git mergetool again.
> 
>   $ git merge topic
>   ...
>   $ git mergetool
>   $ make
>   error: foo.c ... oops screwed up that merge.
> 
> The merge wasn't too painful so I don't mind starting again.
> 
>   $ git reset --hard HEAD^
>   HEAD is now at 59c6097 ...
>   $ git merge topic
>   Auto-merging foo.c
>   CONFLICT (content): Merge conflict in foo.c
>   Auto-merging bar.c
>   CONFLICT (content): bar.c
>   Auto-merging otherfile1.c
>   Auto-merging otherfile2.c
>   Auto-merging otherfile3.c
>   Resolved 'foo.c' using previous resolution.
>   Resolved 'bar.c' using previous resolution.
>   Automatic merge failed; fix conflicts and then commit the result.
>   $ git mergetool
>   No files need merging
> 
> So rerere has remembered the bad resolution of foo.c.  But even if I
> run 'git rerere clear' and repeat the above sequence I get the same
> result.

I think you actually want "rerere forget". Like:

  $ git reset --hard HEAD^
  $ git merge topic
  $ git rerere forget foo.c

Although it is slightly more complicated if you have set
rerere.autoupdate, since it will have cleared the index of any notion
that the path was conflicted. In that case you can then follow the
"rerere forget" with:

  $ git reset --hard
  $ git merge topic

to retry again.

But it doesn't look like you have autoupdate on, from the output above
(it would say "Staged 'foo.c'" instead of "Resolved 'foo.c", I believe).

> I seem to remember something like this coming up before.
> Wasn't there an option added to checkout to allow us to recreate the
> pre-merge state?
> 
>   $ git checkout --merge foo.c
>   $ git mergetool
>   No files need merging

If you have rerere.autoupdate on, then it will have updated the index,
and the path will not appear unmerged. You can use the trick above to
get past it.

If you aren't using rerere.autoupdate (and haven't updated the index
yourself), you shouldn't even need the "git checkout --merge" line. It
just updates the working tree with the conflicted content, but mergetool
will operate directly on the original versions contained in the index,
anyway.

>   $ git status
>   # On branch master
>   # Your branch is behind 'origin/master' by 1 commit, and can be
> fast-forwarded.
>   #
>   # Changes to be committed:
>   ....
>   # Unmerged paths:
>   #   (use "git add/rm <file>..." as appropriate to mark resolution)
>   #
>   #	both modified:      foo.c
>   #
> 
> foo.c now does have conflict markers in it so I think it's crying out
> to be re-merged I just can't convince mergetool to do it. Am I doing
> something wrong?

Hmm. That does seem like "git checkout --merge" did the right thing, but
that "mergetool" is wrong for not accepting it (it _should_ just be
looking at what's in the index to find unmerged paths).

Ahh. It is probably the fault of bb0a484 (mergetool: Skip autoresolved
paths, 2010-08-17), which checks with rerere to avoid resolved paths. So
I think:

  $ git rerere forget foo.c
  $ git mergetool

would do what you want.

-Peff

Re: Redoing a merge for a particular file

[Chris Packham]

Peff sorry for the spam. I forgot to CC the list.

On Fri, Jul 8, 2011 at 10:41 AM, Jeff King <peff@peff.net> wrote:
> On Fri, Jul 08, 2011 at 10:24:10AM +1200, Chris Packham wrote:
>
>> I'm in the middle of merging to branches and I've screwed up my manual
>> merge, I've also got rerere enabled and I can't seem to get back into
>> a state to trigger git mergetool again.
>>
>>   $ git merge topic
>>   ...
>>   $ git mergetool
>>   $ make
>>   error: foo.c ... oops screwed up that merge.
>>
>> The merge wasn't too painful so I don't mind starting again.
>>
>>   $ git reset --hard HEAD^
>>   HEAD is now at 59c6097 ...
>>   $ git merge topic
>>   Auto-merging foo.c
>>   CONFLICT (content): Merge conflict in foo.c
>>   Auto-merging bar.c
>>   CONFLICT (content): bar.c
>>   Auto-merging otherfile1.c
>>   Auto-merging otherfile2.c
>>   Auto-merging otherfile3.c
>>   Resolved 'foo.c' using previous resolution.
>>   Resolved 'bar.c' using previous resolution.
>>   Automatic merge failed; fix conflicts and then commit the result.
>>   $ git mergetool
>>   No files need merging
>>
>> So rerere has remembered the bad resolution of foo.c.  But even if I
>> run 'git rerere clear' and repeat the above sequence I get the same
>> result.
>
> I think you actually want "rerere forget". Like:
>
>  $ git reset --hard HEAD^
>  $ git merge topic
>  $ git rerere forget foo.c
>
> Although it is slightly more complicated if you have set
> rerere.autoupdate, since it will have cleared the index of any notion
> that the path was conflicted. In that case you can then follow the
> "rerere forget" with:
>
>  $ git reset --hard
>  $ git merge topic
>
> to retry again.
>
> But it doesn't look like you have autoupdate on, from the output above
> (it would say "Staged 'foo.c'" instead of "Resolved 'foo.c", I believe).
>
>> I seem to remember something like this coming up before.
>> Wasn't there an option added to checkout to allow us to recreate the
>> pre-merge state?
>>
>>   $ git checkout --merge foo.c
>>   $ git mergetool
>>   No files need merging
>
> If you have rerere.autoupdate on, then it will have updated the index,
> and the path will not appear unmerged. You can use the trick above to
> get past it.
>
> If you aren't using rerere.autoupdate (and haven't updated the index
> yourself), you shouldn't even need the "git checkout --merge" line. It
> just updates the working tree with the conflicted content, but mergetool
> will operate directly on the original versions contained in the index,
> anyway.
>
>>   $ git status
>>   # On branch master
>>   # Your branch is behind 'origin/master' by 1 commit, and can be
>> fast-forwarded.
>>   #
>>   # Changes to be committed:
>>   ....
>>   # Unmerged paths:
>>   #   (use "git add/rm <file>..." as appropriate to mark resolution)
>>   #
>>   #   both modified:      foo.c
>>   #
>>
>> foo.c now does have conflict markers in it so I think it's crying out
>> to be re-merged I just can't convince mergetool to do it. Am I doing
>> something wrong?
>
> Hmm. That does seem like "git checkout --merge" did the right thing, but
> that "mergetool" is wrong for not accepting it (it _should_ just be
> looking at what's in the index to find unmerged paths).
>
> Ahh. It is probably the fault of bb0a484 (mergetool: Skip autoresolved
> paths, 2010-08-17), which checks with rerere to avoid resolved paths. So
> I think:
>
>  $ git rerere forget foo.c
>  $ git mergetool
>
> would do what you want.
>
> -Peff
>

Thanks that sounds like what I want. I've also been a bit lazy and
didn't run 'make install-doc' when I upgraded to 1.7.5.4 so my system
man pages (1.7.0.4) don't mention rerere forget but it's there in
rerere -h.

Perhaps checkout --merge <path> should automagically tell rerere to
forget about the path?

Re: Redoing a merge for a particular file

[Junio C Hamano]

Chris Packham <judge.packham@gmail.com> writes:

> Perhaps checkout --merge <path> should automagically tell rerere to
> forget about the path?

NOOOOOOOO. Please don't.

Re: Redoing a merge for a particular file

[Junio C Hamano]

Chris Packham <judge.packham@gmail.com> writes:

>   $ git merge topic
>   Auto-merging foo.c
>   CONFLICT (content): Merge conflict in foo.c
>   Auto-merging bar.c
>   CONFLICT (content): bar.c
>   Auto-merging otherfile1.c
>   Auto-merging otherfile2.c
>   Auto-merging otherfile3.c
>   Resolved 'foo.c' using previous resolution.
>   Resolved 'bar.c' using previous resolution.
>   Automatic merge failed; fix conflicts and then commit the result.
>   $ git mergetool
>   No files need merging
>
> So rerere has remembered the bad resolution of foo.c.

I would do this:

 $ git rerere forget foo.c
 $ git checkout -m foo.c

then fix it up and

 $ git add foo.c
 $ git commit