From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: cw/submodule-merge-messages (Was: Re: What's cooking in git.git (Aug 2022, #05; Mon, 15))
Date: Tue, 16 Aug 2022 17:36:12 -0700 [thread overview]
Message-ID: <CABPp-BFUSPWhx5GN0KrMzPiLWq+djhfaZQTz0y=r2MeASVrMRw@mail.gmail.com> (raw)
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/
prev parent reply other threads:[~2022-08-17 0:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-15 21:24 What's cooking in git.git (Aug 2022, #05; Mon, 15) Junio C Hamano
2022-08-16 8:56 ` js/bisect-in-c, was " Johannes Schindelin
2022-08-17 1:26 ` Elijah Newren
2022-08-17 6:27 ` Johannes Schindelin
2022-08-17 18:57 ` Junio C Hamano
2022-08-17 19:24 ` Elijah Newren
2022-08-17 20:05 ` Junio C Hamano
2022-08-19 11:04 ` Johannes Schindelin
2022-08-19 14:40 ` Ævar Arnfjörð Bjarmason
2022-08-16 16:00 ` sy/mv-out-of-cone (was Re: What's cooking in git.git (Aug 2022, #05; Mon, 15)) Victoria Dye
2022-08-16 16:16 ` Junio C Hamano
2022-08-17 2:03 ` Shaoxuan Yuan
2022-08-17 0:36 ` Elijah Newren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BFUSPWhx5GN0KrMzPiLWq+djhfaZQTz0y=r2MeASVrMRw@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).