Re: Strange merge conflicts against earlier merge.

From: Petr Baudis <pasky@suse.cz>
Date: Nov 10, 2005, 10:20 UTC
Message-ID: <20051110102043.GQ30496@pasky.or.cz>
In-Reply-To: <46a038f90511091638k726d605r170717539225a712@mail.gmail.com>

Dear diary, on Thu, Nov 10, 2005 at 01:38:35AM CET, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> said that...

Show 11 quoted lines

> We are working with a series of closely related heads, and merging
> among them. I am sometimes finding merge conflicts that I don't think
> I should be seeing. Assuming two branches, 'local' and 'remote', where
> local has with remote before (*), and I have no conflicting changes in
> local...
> 
>  1 - pull and merge from remote. The merge touches file A, B and C
>  2 - on local, develop on unrelated files O,P,Q, commit
>  3 - pull and merge from remote. The merge touches file B, C and D. I
> am sometimes seeing conflicts on file B and C, which was never touched
> on local.

Interesting. Could you check what the merge base is?

	git-merge-base local remote

It should be the merge from (1).

Show 5 quoted lines

> For an example, clone
> http://locke.catalyst.net.nz/git/moodle.git#mdl-artena-tairawhiti and
> register also the
> http://locke.catalyst.net.nz/git/moodle.git#mdl-local branch. Create
> two heads:

Could you please run git-update-server-info over there?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.