Re: [PATCH 01/10] merge-ort: handle D/F conflict where directory disappears due to merge
- From
Elijah Newren <newren@gmail.com>
- Date
- Dec 30, 2020, 15:13 UTC
- Message-ID
- <CABPp-BFrct6hZW8bh5hhRpGSPhjeGO9viCjpO02gUyTqNnrAgg@mail.gmail.com>
- In-Reply-To
- <cb08fd8a-b4e1-77d6-7d8d-9f0431db2404@gmail.com>
On Wed, Dec 30, 2020 at 6:06 AM Derrick Stolee <stolee@gmail.com> wrote:
Show 14 quoted lines
>
> 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.Or perhaps it should have been squashed into an earlier series that was already merged to next.