Re: [PATCH v3 00/16] Use merge_recursive() directly in the builtin am

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 19, 2016, 19:33 UTC
Message-ID: <xmqq4m7lfmn0.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1607191602520.3472@virtualbox>

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

Show 6 quoted lines

> I do not need cc/apply-am at all, it turns out, but my patch series has a
> minor conflict with 'jc/renormalize-merge-kill-safer-crlf'.
>
> Since you indicated that you want to cook that branch a bit in 'next'
> first, I will rebase to master+bc/cocci+js/am-call-theirs-theirs and
> re-submit.

Thanks. I suspect the renomalization would graduate earlier than the topic in question, but leaving dependency to the minimum and have rerere take care of minor conflicts has proved to be a better approach in general over time; the base you chose above sounds appropriate.

Thanks.

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