From: Derrick Stolee <stolee@gmail.com>
Date: Wed, 30 Dec 2020 14:06:15 GMT
Subject: Re: [PATCH 01/10] merge-ort: handle D/F conflict where directory disappears due to merge
Message-ID: <cb08fd8a-b4e1-77d6-7d8d-9f0431db2404@gmail.com>
In-Reply-To: <382a009c18efc8a46a9c0210754f2266c3116ee4.1608270687.git.gitgitgadget@gmail.com>

On 12/18/2020 12:51 AM, Elijah Newren via GitGitGadget wrote:
> +	} else if (ci->df_conflict && ci->merged.result.mode != 0) {
>  		die("Not yet implemented.");
>  	}
>  
>  	/*
>  	 * NOTE: Below there is a long switch-like if-elseif-elseif... block
>  	 *       which the code goes through even for the df_conflict cases
> -	 *       above.  Well, it will once we don't die-not-implemented above.
> +	 *       above.
>  	 */

This comment change might be a bit premature.

Thanks,
-Stolee