git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Problem merging

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Nov 23, 2005, 02:50 UTC
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
Next: Junio C Hamano
Message 1 of 10 in “Problem merging”
  1. Luben TuikovNov 23, 2005
  2. Junio C HamanoNov 23, 2005
  3. Luben TuikovNov 23, 2005
  4. Johannes SchindelinNov 23, 2005
  5. Ben CliffordNov 24, 2005
  6. Johannes SchindelinNov 25, 2005
  7. Andreas EricssonNov 25, 2005
  8. H. Peter AnvinNov 27, 2005
  9. Fredrik KuivinenNov 23, 2005
  10. Junio C HamanoNov 23, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.