{"thread":{"id":"13140","subject":"git merge exit code semantics","startedAt":"2008-04-16T17:12:31Z","lastAt":"2008-04-16T17:12:31Z","messageCount":1,"participants":["David Mansfield"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"74568","messageId":"1208365951.16608.28.camel@gandalf.cobite.com","threadId":"13140","inReplyTo":null,"subject":"git merge exit code semantics","fromName":"David Mansfield","fromEmail":"david@cobite.com","sentAt":"2008-04-16T17:12:31Z","receivedAt":"2008-04-16T17:12:31Z","isPatch":false,"sender":{"key":"david@cobite.com","avatar":null},"body":"Hi,\n\nIs there any place I can find the semantics for exit code values for\n'git-merge'? \n\nI would assume that '0' means merge was successful and '1' means there\nwas a conflict, but it doesn't state it (and should) in the\ndocumentation.\n\nAfter being confused by git-status, I felt I should ask.\n\nIf someone can explain it, I could probably cook up a patch for the\ndocs. \n\nDavid\n"}]}