From: Junio C Hamano <gitster@pobox.com>
To: lilinchao@oschina.cn
Cc: git <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Aug 2021, #08; Mon, 23)
Date: Fri, 27 Aug 2021 09:03:31 -0700 [thread overview]
Message-ID: <xmqqfsuuc1t8.fsf@gitster.g> (raw)
In-Reply-To: <1690c9c8072211ecb75c0026b95c99cc@oschina.cn> (lilinchao@oschina.cn's message of "Fri, 27 Aug 2021 18:32:32 +0800")
"lilinchao@oschina.cn" <lilinchao@oschina.cn> writes:
>>* jc/trivial-threeway-binary-merge (2021-07-28) 1 commit
>> - ll-merge: teach ll_binary_merge() a trivial three-way merge
>>
>> The built-in merge driver for binary files learned to resolve
>> trivial three-way merges (e.g. apply change, which turns A into B,
>> to content A) by itself, which would help "git apply --3way" used
>> when there is no need to use "--3way".
>>
>> Will discard.
>> Replace with a trivial-merge logic in apply.c::try_treeway() or
>> apply.c::three_way_merge().
>>
> This patch seems to have missed several merge cycles, hope it can go to next stage as soon as possible.
The posted patch that is queued will not go to any stage as-is. The
basic idea in it may be sound but it needs to happen at a different
layer, but no such updated patch exists and I never had time to do
so myself.
prev parent reply other threads:[~2021-08-27 16:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-23 21:39 What's cooking in git.git (Aug 2021, #08; Mon, 23) Junio C Hamano
2021-08-24 10:08 ` Ævar Arnfjörð Bjarmason
2021-08-25 0:09 ` Junio C Hamano
2021-08-24 17:51 ` Jonathan Tan
2021-08-25 0:15 ` Junio C Hamano
2021-08-27 10:32 ` lilinchao
2021-08-27 16:03 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfsuuc1t8.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=lilinchao@oschina.cn \
/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.
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 NNTP newsgroup(s).