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

Re: Strange merge conflicts against earlier merge.

From
Junio C Hamano <junkio@cox.net>
Date
Nov 11, 2005, 22:39 UTC
Message-ID
<7vy83ukdwf.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20051111215620.GX16061@pasky.or.cz>
Petr Baudis <pasky@ucw.cz> writes:
> 	16    anc1/anc2 anc1    anc2      no merge
>
> What ends up in the index at this moment as "stage 1"? anc1? anc2?
> Two stage 1 entries? And what does git-merge-index do about this?

I think we decided there is no single sensible resolution, and we leave stage 1 empty.

Come to think of it, we should signal that we are punting by either exiting non-zero, or stuffing 0{40} SHA1 in stage1, so that we can distinguish the case with two sides adding things differently. Daniel, what do you think?

Previous: Petr BaudisNext: Daniel Barkalow
Message 11 of 13 in “Strange merge conflicts against earlier merge.”
  1. Martin LanghoffNov 10, 2005
  2. Petr BaudisNov 10, 2005
  3. Martin LanghoffNov 11, 2005
  4. Petr BaudisNov 11, 2005
  5. Fredrik KuivinenNov 11, 2005
  6. Petr BaudisNov 11, 2005
  7. Petr BaudisNov 11, 2005
  8. Junio C HamanoNov 11, 2005
  9. Petr BaudisNov 11, 2005
  10. Petr BaudisNov 11, 2005
  11. Junio C HamanoNov 11, 2005
  12. Daniel BarkalowNov 11, 2005
  13. Junio C HamanoNov 12, 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.