Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"

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

Subject: Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
From: Sergey Organov <sorganov@xxxxxxxxx>
Date: Sat, 25 Feb 2023 18:15:40 +0300
Cc: Tao Klerks <tao@xxxxxxxxxx>, phillip.wood@xxxxxxxxxxxxx, Alex Henrie <alexhenrie24@xxxxxxxxx>, Tao Klerks via GitGitGadget <gitgitgadget@xxxxxxxxx>, git@xxxxxxxxxxxxxxx, Johannes Schindelin <Johannes.Schindelin@xxxxxx>
In-reply-to: <CABPp-BHRbKG_cXdwaPT0-Rj6QTkkJRcT4N0f45==i7oAqiTC+w@mail.gmail.com> (Elijah Newren's message of "Fri, 24 Feb 2023 15:59:36 -0800")
References: <pull.1474.git.1675614276549.gitgitgadget@gmail.com> <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com> <CAPMMpogFAR6cvcR8T5fx+AoytAJ7TsPpSeOjHNzW4Gmkuq7FLQ@mail.gmail.com> <CAMMLpeTQ1RpsvwRdZ0G3wdvH1+LXE5tw=7Cs6Q+HxMcRU0qj5Q@mail.gmail.com> <CABPp-BFxGYQ_JTC5c4_S_gOK3GxWKuZ=KfvycpkBjPGyKzCJ+g@mail.gmail.com> <c3ef69e0-c37a-01fe-a40a-c2940e329793@dunelm.org.uk> <CAPMMpogi_QoGKD824JW+85v_Sgaf5d3TAd_P55YyT5NF6AUJ=w@mail.gmail.com> <87a615vkqk.fsf@osv.gnss.ru> <CABPp-BH2XPB4BN5Oo=VnLav_wvAGGUAyZC4HRHRRmES5k75P1Q@mail.gmail.com> <87bklilnvp.fsf@osv.gnss.ru> <CABPp-BHRbKG_cXdwaPT0-Rj6QTkkJRcT4N0f45==i7oAqiTC+w@mail.gmail.com>
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)

Elijah Newren <newren@xxxxxxxxx> writes:

> On Fri, Feb 24, 2023 at 2:06 PM Sergey Organov <sorganov@xxxxxxxxx> wrote:
>>
>> Elijah Newren <newren@xxxxxxxxx> writes:

[...]

> Please, go read at least [1] to see Johannes comments about how the
> prior proposals don't work beyond simple cases.

It's exactly handling of simple cases that we need most. We can get
fancy afterwards, if feasible.

Thanks,
-- Sergey Organov

Follow-Ups:
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Elijah Newren

References:
- [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Tao Klerks via GitGitGadget
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Alex Henrie
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Tao Klerks
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Alex Henrie
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Elijah Newren
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Phillip Wood
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Tao Klerks
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Sergey Organov
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Elijah Newren
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Sergey Organov
- Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
  - From: Elijah Newren

Prev by Date: Re: [PATCH v4 1/3] branch: avoid unnecessary worktrees traversals
Next by Date: Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
Previous by thread: Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
Next by thread: Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
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]