From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Fri, 11 Nov 2005 04:40:05 GMT
Subject: Re: Strange merge conflicts against earlier merge.
Message-ID: <46a038f90511102040n3e251252rce54117c51ce0429@mail.gmail.com>
In-Reply-To: <20051110102043.GQ30496@pasky.or.cz>

On 11/10/05, Petr Baudis <pasky@suse.cz> wrote:
> Interesting. Could you check what the merge base is?
>
>         git-merge-base local remote
>
> It should be the merge from (1).

It seems to be actually one of the parents, not the merge itself.

> > 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?

Should be fixed now...

cheers,


martin