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

situation codes (e.g. #16) in unpack-trees.c

From
JEJeff Enderwick <jeff.enderwick@gmail.com>
Date
Aug 12, 2009, 21:05 UTC
Message-ID
<bb6059c00908121405t4f34c50eo532b928fa6d6f89c@mail.gmail.com>

Newbie here. I'm trying to grok git's merge algorithms. Where are those '#' codes written up (e.g. #16, #5ALT, etc)? Is there a write-up anywhere on the merge logic?

TIA, Jeff

Next: Jeff King
Message 1 of 2 in “situation codes (e.g. #16) in unpack-trees.c”
  1. Jeff EnderwickAug 12, 2009
  2. Jeff KingAug 12, 2009

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.