From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 02 Aug 2022 22:22:17 GMT
Subject: Re: [PATCH v7] submodule merge: update conflict error message
Message-ID: <xmqq4jyuffqe.fsf@gitster.g>
In-Reply-To: <CAFySSZA2FzUfN94Gr6a_470GzjeT7V1zqHrdBe6YUQ0Tv3pdvg@mail.gmail.com>

Calvin Wan <calvinwan@google.com> writes:

> I'm starting to think this is getting out of scope for my patch.
> For the errors, "not checked out" and "commits not present",
> I will have a NEEDSWORK bit attached to them in
> print_submodule_conflict(), and if any of the submodules has
> those errors, then my message won't print out. That way,
> we are guaranteed to have 'a' checked out when my message
> prints, rendering it redundant.

That's fine, then.

Thanks for thinking it through.