From: Luben Tuikov <ltuikov@yahoo.com>
Date: Wed, 23 Nov 2005 02:50:01 GMT
Subject: Problem merging
Message-ID: <20051123025001.15527.qmail@web31812.mail.mud.yahoo.com>

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.

Thanks,
    Luben