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

Re: Problem merging

From
Junio C Hamano <junkio@cox.net>
Date
Nov 23, 2005, 03:06 UTC
Message-ID
<7v4q6483ms.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20051123025001.15527.qmail@web31812.mail.mud.yahoo.com>
Luben Tuikov <ltuikov@yahoo.com> writes:
Show 13 quoted lines
> 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.

As "Merging two branches" section in Documentation/tutorial.txt shows, it is one of the valid outcome from merge to leave conflicts and have you manually resolve. So this process probably is working correctly for you this time as well.

Sorry, but I am not a good enough cryptoanalyst to reverse SHA1 hashes, and I cannot tell if the merge you did *should* have resulted in the conflict or not, just by looking at the three commit object IDs.

What does "git diff" and "git diff HEAD" tell you after the merge procedure leaves conflict in the working tree (branchB directory, I mean)?

Previous: Luben TuikovNext: Luben Tuikov
Message 2 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.