Re: [PATCH v2 09/11] merge-ort: add implementation of rename/delete conflicts

From: Derrick Stolee <stolee@gmail.com>
Date: Dec 15, 2020, 14:27 UTC
Message-ID: <217853ab-35c3-e5c9-f29e-2e1470386feb@gmail.com>
In-Reply-To: <f017534243c967caa0137e6899f4e1c69ff02c2e.1607962900.git.gitgitgadget@gmail.com>

On 12/14/2020 11:21 AM, Elijah Newren via GitGitGadget wrote:

>  		if (type_changed && collision) {
>  			/* special handling so later blocks can handle this */
>  			die("Not yet implemented");
> +		if (source_deleted) {

I didn't catch this in my earlier message, but the opening brace of the if (type_changed && collision) gets squashed here, causing a compiler break.

Thanks, -Stolee

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