From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Laďa Tesařík" <lada.tesarik@olc.cz>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Lost file after git merge
Date: Fri, 29 Jul 2022 15:04:33 -0700 [thread overview]
Message-ID: <xmqqh72z4lu6.fsf@gitster.g> (raw)
In-Reply-To: <701c318c-1a1b-1793-90e8-807cf97dc948@web.de> ("René Scharfe"'s message of "Fri, 29 Jul 2022 22:23:18 +0200")
René Scharfe <l.s.r@web.de> writes:
>> Three-way merge between X and Y is all about taking what X did if Y
>> didn't have any opinion on what X touched. This is exactly that
>> case. The history 0--->3 didn't have any opinion on what should be
>> in P or whether P should exist, and that is why there is no change
>> between these two endpoints.
>
> The last sentence is not necessarily true. You could also say that
> 0--->3 cared so much about path P having content A that it brought it
> back from the void. Determining whether a de-facto revert
> - intended to return to an uncaring state of "take whatever main has" or
> - meant to choose *that* specific content which incidentally is on main
> is not possible from the snapshots at the merge point alone, I think.
Yes, it is doable. It no longer is a three-way merge if we did so,
though ;-)
next prev parent reply other threads:[~2022-07-29 22:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 8:23 Lost file after git merge Laďa Tesařík
2022-07-28 12:17 ` Ævar Arnfjörð Bjarmason
2022-07-28 17:11 ` Junio C Hamano
2022-07-29 20:23 ` René Scharfe
2022-07-29 22:04 ` Junio C Hamano [this message]
2022-07-30 2:16 ` Elijah Newren
2022-07-30 14:44 ` René Scharfe
2022-07-31 1:45 ` Elijah Newren
2022-07-28 21:23 ` brian m. carlson
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=xmqqh72z4lu6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=lada.tesarik@olc.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.