From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Wed, 23 Nov 2005 08:59:53 GMT
Subject: Re: Problem merging
Message-ID: <20051123085953.GA4933@c165.ib.student.liu.se>
In-Reply-To: <20051123025001.15527.qmail@web31812.mail.mud.yahoo.com>

On Tue, Nov 22, 2005 at 06:50:01PM -0800, Luben Tuikov wrote:
> Ok, background:
> 
> I've two branches of the same .git, _but_ they live in
> different directories (bearing the branches' names)
> with different index caches, but with the same identical
> objects directory (different HEADs of course).
> (in effect, I have both branches "checked out")
> 
> Branch A is the "trunk", branch B is trunk+my changes.
> I do:
> 
> branchA: git pull <remote>
> branchA: cd ../branchB/
> branchB: git resolve HEAD branchA "merge trunk"
> 
> And I get:
> 
> Trying to merge 4b4a27dff4e2d4cc2eac1cde31aede834a966a48 into
> e1ef47b54d7e7e477f7f1eb3251a9d37f38e0469 using 989e4d6cbc69191c41ddf4b1c492457410376b43.
> Simple merge failed, trying Automatic merge
> Removing include/asm-um/ldt.h
> fatal: merge program failed
> Automatic merge failed, fix up by hand
> 
> This is with git HEAD: 
> 2392ee98eb76aa821de53c93c9e36acb18d27fc0 -- latest as
> of now.
> 
> Is this a bug in git?  Since this process has always worked
> before.

Have you tried this merge with the recursive merge strategy?

Btw is there a reason why 'recursive' isn't the default merge strategy
for git-merge? It might be a bit confusing that git-pull and git-merge
have different default strategies...

- Fredrik