Re: [PATCH v7] submodule merge: update conflict error message
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 2, 2022, 21:11 UTC
- Message-ID
- <xmqqo7x2fj05.fsf@gitster.g>
- In-Reply-To
- <CAFySSZCEWX22h1FBX65=eofNm+WU97DtL7P+11WFie72DQLDkg@mail.gmail.com>
Calvin Wan <calvinwan@google.com> writes:
Show 5 quoted lines
> I'm thinking something like this:
>
> "go to submodule ('sub' : 'a'), and either merge commit 'b'\n"
> "go to submodule ('sub', 'a'), and either merge commit 'b'\n"
> "go to submodule 'sub', commit 'a', and either merge commit 'b'\n"In the first two, I suspect that it may not be quite clear what 'a' means to the user. In the third one, the first "commit" might be mistaken as a verb. I am tempted to say
cd to <sub>, run "checkout --detach <a>" then "merge <b>"
but that may be a bit too prescriptive. I dunno.