Re: [PATCH] sequencer: allow disabling conflict advice

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH] sequencer: allow disabling conflict advice
From: Junio C Hamano <gitster@xxxxxxxxx>
Date: Sat, 09 Mar 2024 11:56:16 -0800
Cc: Philippe Blain <levraiphilippeblain@xxxxxxxxx>, Philippe Blain via GitGitGadget <gitgitgadget@xxxxxxxxx>, git@xxxxxxxxxxxxxxx
In-reply-to: <b52a8678-a13f-455b-a817-2df2b4fab795@gmail.com> (Phillip Wood's message of "Sat, 9 Mar 2024 19:15:16 +0000")
References: <pull.1682.git.1709396291693.gitgitgadget@gmail.com> <3df4790a-7ee1-4c72-a3da-ba8a48d546b8@gmail.com> <6a31efcc-c6c2-4729-80b9-eecff4ec9e31@gmail.com> <xmqqy1axq3t1.fsf@gitster.g> <12c84208-23a7-5ba7-18a9-822d9a8f66fa@gmail.com> <b52a8678-a13f-455b-a817-2df2b4fab795@gmail.com>
User-agent: Gnus/5.13 (Gnus v5.13)

Phillip Wood <phillip.wood123@xxxxxxxxx> writes:

>> Maybe just 'advice.mergeConflict' ?
>
> 'advice.mergeConflict' sounds good to me

Yup, looks good to me, too.

References:
- [PATCH] sequencer: allow disabling conflict advice
  - From: Philippe Blain via GitGitGadget
- Re: [PATCH] sequencer: allow disabling conflict advice
  - From: Phillip Wood
- Re: [PATCH] sequencer: allow disabling conflict advice
  - From: Phillip Wood
- Re: [PATCH] sequencer: allow disabling conflict advice
  - From: Junio C Hamano
- Re: [PATCH] sequencer: allow disabling conflict advice
  - From: Philippe Blain
- Re: [PATCH] sequencer: allow disabling conflict advice
  - From: Phillip Wood

Prev by Date: Re: [PATCH] sequencer: allow disabling conflict advice
Next by Date: Re: [PATCH 2/2] merge-ort/merge-recursive: do report errors in `merge_submodule()`
Previous by thread: Re: [PATCH] sequencer: allow disabling conflict advice
Next by thread: Re: [PATCH] sequencer: allow disabling conflict advice
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]