From: Elijah Newren <newren@gmail.com>
Date: Mon, 30 Nov 2020 16:56:46 GMT
Subject: Re: [PATCH 05/20] merge-ort: add an err() function similar to one from merge-recursive
Message-ID: <CABPp-BGEL1mTgfa8KzD=r+3UwUikU6ZyCSfxgpbanNuqmrzGqw@mail.gmail.com>
In-Reply-To: <87im9ojwbd.fsf@evledraar.gmail.com>

On Sun, Nov 29, 2020 at 2:23 AM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
>
> On Sun, Nov 29 2020, Elijah Newren via GitGitGadget wrote:
>
> >  static int collect_merge_info(struct merge_options *opt,
> >                             struct tree *merge_base,
> >                             struct tree *side1,
> >                             struct tree *side2)
> >  {
> > +     /* TODO: Implement this using traverse_trees() */
> >       die("Not yet implemented.");
> >  }
> >
>
> Looks like this doesn't belong in this patch & should instead be
> squashed into "[PATCH 02/20] merge-ort: add some high-level algorithm
> structure".

Indeed, and Derrick pointed out the same thing but when I went back
through all the emails to try to make sure I covered everything, I
somehow missed that particular piece of his comments.  Anyway, I've
fixed it up locally along with your two other suggestions.  I'll wait
a bit more for other feedback before sending the next re-roll.

Thanks for taking a look!