threads / discuss / 20564

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

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

## tl;dr

2 messages between Aug 12, 2009 and Aug 12, 2009.

replies: 1people: 2as markdown or json

Jeff Enderwick· Aug 12, 2009, 21:05 UTC · lore

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

Jeff King· Aug 12, 2009, 21:07 UTC · re: Jeff Enderwick · lore

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

On Wed, Aug 12, 2009 at 02:05:06PM -0700, Jeff Enderwick wrote:

> 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?

Try Documentation/technical/trivial-merge.txt.

-Peff