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

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

[Jeff Enderwick]

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

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

[Jeff King]

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