From: Elijah Newren <newren@gmail.com>
Date: Wed, 17 Aug 2022 00:36:12 GMT
Subject: cw/submodule-merge-messages (Was: Re: What's cooking in git.git (Aug 2022, #05; Mon, 15))
Message-ID: <CABPp-BFUSPWhx5GN0KrMzPiLWq+djhfaZQTz0y=r2MeASVrMRw@mail.gmail.com>
In-Reply-To: <xmqq5yityzcu.fsf@gitster.g>

On Mon, Aug 15, 2022 at 6:50 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> * cw/submodule-merge-messages (2022-08-04) 1 commit
>   (merged to 'next' on 2022-08-12 at ede0890319)
>  + submodule merge: update conflict error message
>
>  Update the message given when "git merge" sees conflicts at a path
>  with a submodule while merging a superproject.
>
>  Will merge to 'master'.
>  source: <20220804195105.1303455-1-calvinwan@google.com>

I apologize for being away and not reviewing again before this merged
to next (vacation followed by coming down with Covid).  I noticed a
few issues with v8, so I submitted a few patches meant to go on top:
   https://lore.kernel.org/git/pull.1325.git.1660696081.gitgitgadget@gmail.com/