From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Elijah Newren" <newren@gmail.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"ZheNing Hu" <adlternative@gmail.com>,
"Kristoffer Haugsbakk" <code@khaugsbakk.name>,
"Rubén Justo" <rjusto@gmail.com>,
"Philippe Blain" <levraiphilippeblain@gmail.com>
Subject: Re: [PATCH v3 0/2] Allow disabling advice shown after merge conflicts
Date: Mon, 25 Mar 2024 09:57:55 -0700 [thread overview]
Message-ID: <xmqqle66mep8.fsf@gitster.g> (raw)
In-Reply-To: <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com> (Phillip Wood's message of "Mon, 25 Mar 2024 10:48:12 +0000")
Phillip Wood <phillip.wood123@gmail.com> writes:
> Hi Philippe
>
> On 16/03/2024 21:16, Philippe Blain via GitGitGadget wrote:
>> Changes since v2:
>> * expanded the commit messages to explain why the tests for 'git
>> rebase' do
>> not need to be adjusted
>> * adjusted the wording of the new 'advice.mergeConflict' in the doc, as
>> suggested by Kristoffer for uniformity with his series which is already
>> merged to 'master' (b09a8839a4 (Merge branch
>> 'kh/branch-ref-syntax-advice', 2024-03-15)).
>> * checked all new output manually and consequently adjusted the code in 1/2
>> to avoid a lonely 'hint: ' line.
>> * adjusted the addition in advice.h in 1/2 to put the new enum
>> alphabetically, as noticed by Rubén.
>> * added misssing newlines in 2/2 as noticed by Phillip and tweaked by
>> Junio.
>> * rebased on master (2953d95d40 (The eighth batch, 2024-03-15)), to avoid
>> conflicts in 'Documentation/config/advice.txt' due to Kristoffer's merged > series
>> [...] Note that the code path where 'git rebase --apply' stops
>> because of
>> conflicts is not covered by the tests but I tested it manually using this
>> diff:
>> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
>> index 47534f1062..34eac2e6f4 100755
>> --- a/t/t5520-pull.sh
>> +++ b/t/t5520-pull.sh
>> @@ -374,7 +374,7 @@ test_pull_autostash_fail ()
>> echo conflicting >>seq.txt &&
>> test_tick &&
>> git commit -m "Create conflict" seq.txt &&
>> - test_must_fail git pull --rebase . seq 2>err >out &&
>> + test_must_fail git -c rebase.backend=apply pull --rebase . seq 2>err >out &&
>> test_grep "Resolve all conflicts manually" err
>> '
>
> Thanks for being so thorough, this version looks good to me
Yup, these look good. Let's mark the topic for 'next'.
Thanks, both.
prev parent reply other threads:[~2024-03-25 17:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-02 16:18 [PATCH] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-02 16:32 ` Philippe Blain
2024-03-03 22:57 ` Junio C Hamano
2024-03-09 17:22 ` Philippe Blain
2024-03-09 18:58 ` Philippe Blain
2024-03-09 19:55 ` Junio C Hamano
2024-03-09 23:19 ` Junio C Hamano
2024-03-04 10:12 ` Phillip Wood
2024-03-04 10:27 ` Phillip Wood
2024-03-04 17:56 ` Junio C Hamano
2024-03-09 17:53 ` Philippe Blain
2024-03-09 19:15 ` Phillip Wood
2024-03-09 19:56 ` Junio C Hamano
2024-03-09 18:01 ` Philippe Blain
2024-03-10 19:50 ` [PATCH v2 0/2] Allow disabling advice shown after merge conflicts Philippe Blain via GitGitGadget
2024-03-10 19:51 ` [PATCH v2 1/2] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-11 10:29 ` Kristoffer Haugsbakk
2024-03-16 19:33 ` Philippe Blain
2024-03-10 19:51 ` [PATCH v2 2/2] builtin/am: " Philippe Blain via GitGitGadget
2024-03-11 10:54 ` phillip.wood123
2024-03-11 17:12 ` Junio C Hamano
2024-03-11 17:49 ` Junio C Hamano
2024-03-16 19:44 ` Philippe Blain
2024-03-16 20:01 ` Philippe Blain
2024-03-11 20:58 ` [PATCH v2 0/2] Allow disabling advice shown after merge conflicts Rubén Justo
2024-03-16 20:33 ` Philippe Blain
2024-03-16 21:16 ` [PATCH v3 " Philippe Blain via GitGitGadget
2024-03-16 21:16 ` [PATCH v3 1/2] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-16 21:16 ` [PATCH v3 2/2] builtin/am: " Philippe Blain via GitGitGadget
2024-03-18 16:31 ` [PATCH v3 0/2] Allow disabling advice shown after merge conflicts Junio C Hamano
2024-03-25 10:48 ` Phillip Wood
2024-03-25 16:57 ` Junio C Hamano [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=xmqqle66mep8.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=levraiphilippeblain@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rjusto@gmail.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).