Re: [PATCH 08/12] merge-ort: provide a merge_get_conflicted_files() helper function

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 13, 2022, 10:21 UTC
Message-ID: <nycvar.QRO.7.76.6.2205131220200.352@tvgsbejvaqbjf.bet>
In-Reply-To: <nycvar.QRO.7.76.6.2203101546110.357@tvgsbejvaqbjf.bet>

Hi Elijah,

On Thu, 10 Mar 2022, Johannes Schindelin wrote:

Show 12 quoted lines

> On Tue, 8 Mar 2022, Elijah Newren wrote:
>
> > So, this is one series where even if everyone else says to merge it
> > already, I'd like to wait a bit longer on it until I feel confident we
> > have a solution that handles at least the current usecases.
>
> Fair enough, you're in charge of this series, and I really like what you
> came up with.
>
> My thinking was driven more by the users' side, as I am relatively eager
> to integrate this into production, but am loathe to do that with an early
> iteration of `en/merge-tree` that might be substantially revamped, still.

I've been bogged down with things elsewhere, but should now have time to help on this end.

Elijah, _is_ there anything I can help with?

Thanks, Dscho