From: Sergey Organov <sorganov@gmail•com>
To: Elijah Newren <newren@gmail•com>
Cc: Tao Klerks <tao@klerks•biz>,
phillip.wood@dunelm•org.uk, Alex Henrie <alexhenrie24@gmail•com>,
Tao Klerks via GitGitGadget <gitgitgadget@gmail•com>,
git@vger•kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx•de>
Subject: Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
Date: Sat, 25 Feb 2023 18:15:40 +0300 [thread overview]
Message-ID: <87fsatixnn.fsf@osv.gnss.ru> (raw)
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")
Elijah Newren <newren@gmail•com> writes:
> On Fri, Feb 24, 2023 at 2:06 PM Sergey Organov <sorganov@gmail•com> wrote:
>>
>> Elijah Newren <newren@gmail•com> 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
next prev parent reply other threads:[~2023-02-25 15:15 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-05 16:24 [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true" Tao Klerks via GitGitGadget
2023-02-16 3:22 ` Alex Henrie
2023-02-16 12:31 ` Tao Klerks
2023-02-17 3:15 ` Alex Henrie
2023-02-17 11:15 ` Tao Klerks
2023-02-17 18:56 ` Alex Henrie
2023-02-17 17:39 ` Junio C Hamano
2023-02-18 3:17 ` Elijah Newren
2023-02-18 16:39 ` Phillip Wood
2023-02-20 8:03 ` Tao Klerks
2023-02-20 16:45 ` Phillip Wood
2023-02-20 16:56 ` Elijah Newren
2023-02-21 14:04 ` Tao Klerks
2023-02-22 14:27 ` Sergey Organov
2023-02-24 7:06 ` Elijah Newren
2023-02-24 22:06 ` Sergey Organov
2023-02-24 23:59 ` Elijah Newren
2023-02-25 15:15 ` Sergey Organov [this message]
2023-02-25 16:28 ` Elijah Newren
2023-02-26 9:29 ` Sergey Organov
2023-02-27 15:20 ` Elijah Newren
2023-02-27 17:17 ` Sergey Organov
2023-02-28 2:35 ` Elijah Newren
2023-02-20 16:46 ` Elijah Newren
2023-02-20 6:01 ` Tao Klerks
2023-02-20 17:20 ` Elijah Newren
2023-02-20 18:33 ` Alex Henrie
2023-02-21 15:40 ` Tao Klerks
2023-02-21 17:45 ` Alex Henrie
2023-02-21 15:01 ` Tao Klerks
2023-02-24 7:06 ` Elijah Newren
2023-02-28 14:13 ` Felipe Contreras
2023-02-28 20:04 ` Alex Henrie
2023-03-01 12:46 ` Felipe Contreras
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fsatixnn.fsf@osv.gnss.ru \
--to=sorganov@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=alexhenrie24@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=tao@klerks$(echo .)biz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox