{"thread":{"id":"20564","subject":"situation codes (e.g. #16) in unpack-trees.c","startedAt":"2009-08-12T21:05:06Z","lastAt":"2009-08-12T21:07:27Z","messageCount":2,"participants":["Jeff Enderwick","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"120454","messageId":"bb6059c00908121405t4f34c50eo532b928fa6d6f89c@mail.gmail.com","threadId":"20564","inReplyTo":null,"subject":"situation codes (e.g. #16) in unpack-trees.c","fromName":"Jeff Enderwick","fromEmail":"jeff.enderwick@gmail.com","sentAt":"2009-08-12T21:05:06Z","receivedAt":"2009-08-12T21:05:06Z","isPatch":false,"sender":{"key":"jeff.enderwick@gmail.com","avatar":null},"body":"Newbie here. I'm trying to grok git's merge algorithms. Where are\nthose '#' codes written up (e.g. #16, #5ALT, etc)?\nIs there a write-up anywhere on the merge logic?\n\nTIA,\nJeff\n"},{"id":"120455","messageId":"20090812210726.GA16640@coredump.intra.peff.net","threadId":"20564","inReplyTo":"bb6059c00908121405t4f34c50eo532b928fa6d6f89c@mail.gmail.com","subject":"Re: situation codes (e.g. #16) in unpack-trees.c","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-08-12T21:07:27Z","receivedAt":"2009-08-12T21:07:27Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Aug 12, 2009 at 02:05:06PM -0700, Jeff Enderwick wrote:\n\n> Newbie here. I'm trying to grok git's merge algorithms. Where are\n> those '#' codes written up (e.g. #16, #5ALT, etc)?\n> Is there a write-up anywhere on the merge logic?\n\nTry Documentation/technical/trivial-merge.txt.\n\n-Peff\n"}]}