git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git merge exit code semantics

From
DMDavid Mansfield <david@cobite.com>
Date
Apr 16, 2008, 17:12 UTC
Message-ID
<1208365951.16608.28.camel@gandalf.cobite.com>
Hi,

Is there any place I can find the semantics for exit code values for 'git-merge'?

I would assume that '0' means merge was successful and '1' means there was a conflict, but it doesn't state it (and should) in the documentation.

After being confused by git-status, I felt I should ask.

If someone can explain it, I could probably cook up a patch for the docs. 

David
Message 1 of 1 in “git merge exit code semantics”
  1. David MansfieldApr 16, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.