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

Re: merge-recursive: do not rudely die on binary merge

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 15, 2007, 00:07 UTC
Message-ID
<7vps1paceh.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20070814231422.GA10662@pe.Belkin>
Chris Shoemaker <c.shoemaker@cox.net> writes:
> Very nice. Thanks, Junio.  As an additional convenience, it would be
> nice to make the "theirs" version easily accessible.
People should learn this command.  Really.
	$ git cat-file -p :$n:path

where $n == 2 is ours, $n == 1 is common ancestor, and $n == 3 is theirs.

Previous: Chris ShoemakerNext: Nikodemus Siivola
Message 3 of 22 in “merge-recursive: do not rudely die on binary merge”
  1. Junio C HamanoAug 14, 2007
  2. Chris ShoemakerAug 14, 2007
  3. Junio C HamanoAug 15, 2007
  4. Nikodemus SiivolaAug 15, 2007
  5. Junio C HamanoAug 15, 2007
  6. Document what the stage numbers in the :$n:path syntax mean.Steven Grimm, Aug 20, 2007
  7. Jeff KingAug 20, 2007
  8. Shawn O. PearceAug 20, 2007
  9. Shawn O. PearceAug 20, 2007
  10. Florian WeimerAug 20, 2007
  11. Jeff KingAug 20, 2007
  12. Junio C HamanoAug 20, 2007
  13. Jeff KingAug 20, 2007
  14. Jakub NarebskiAug 22, 2007
  15. Jeff KingAug 20, 2007
  16. Johannes SixtAug 20, 2007
  17. Junio C HamanoAug 20, 2007
  18. Jan HudecAug 20, 2007
  19. Junio C HamanoAug 20, 2007
  20. Junio C HamanoAug 15, 2007
  21. Chris LarsonAug 15, 2007
  22. Chris ShoemakerAug 15, 2007

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.