Re: [PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 5, 2016, 17:43 UTC
Message-ID: <xmqqmviipu7p.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1610051348020.35196@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Actually, come to think of it, I will change the patch, as it is too
> confusing. What I want is to preserve a positive return value in case of
> merge conflicts, and that is exactly what I should do instead of playing
> games with the Boolean OR operator.

That would be good; that was exactly the confusion I felt that led to my comments.

$ 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.