# situation codes (e.g. #16) in unpack-trees.c 2 messages from 2009-08-12 to 2009-08-12. Participants: Jeff Enderwick, Jeff King. Thread: https://gitlist.dev/t/20564 ## Jeff Enderwick, 2009-08-12 21:05 Subject: situation codes (e.g. #16) in unpack-trees.c Message-ID: URL: https://gitlist.dev/e/bb6059c00908121405t4f34c50eo532b928fa6d6f89c%40mail.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 ``` ## Jeff King, 2009-08-12 21:07 Subject: Re: situation codes (e.g. #16) in unpack-trees.c Message-ID: <20090812210726.GA16640@coredump.intra.peff.net> URL: https://gitlist.dev/e/20090812210726.GA16640%40coredump.intra.peff.net In-Reply-To: ``` 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 ```