From: Junio C Hamano <gitster@pobox•com>
To: "brian m. carlson" <sandals@crustytoothpaste•net>
Cc: Eugen Konkov <kes-kes@yandex•ru>,
Git Mailing List <git@vger•kernel.org>
Subject: Re: Why merge conflict block is located at the wrong place?
Date: Sun, 23 Mar 2025 22:39:01 -0700 [thread overview]
Message-ID: <xmqqsen3oumi.fsf@gitster.g> (raw)
In-Reply-To: <Z9_Pkb7N1J_J9ECo@tapette.crustytoothpaste.net> (brian m. carlson's message of "Sun, 23 Mar 2025 09:08:33 +0000")
"brian m. carlson" <sandals@crustytoothpaste•net> writes:
> On 2025-03-22 at 23:16:49, Eugen Konkov wrote:
>> Hello Git,
>
> Hi,
>
>> Why merge conflict block is located at the wrong place?
>
> I think it's a little hard for us to comment on why this happens without
> a reproducible testcase. Do you perhaps have a public repository that
> you're working with that you can use to demonstrate this, or a shell
> script that shows the problem?
We do not necessarily need a full repository, though.
It is sufficient to make the contents of the three blob objects
involved in the merge (i.e. the version in the common ancestor, and
the versions in ours and in theirs) available in order to let
anybody reproduce the symptom with "git merge-file", and that would
give us a chance to check the same input with "merge" from the RCS
suite to see if the output in question is really unreasonable or if
the expectation is skewed.
prev parent reply other threads:[~2025-03-24 5:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-22 23:16 Why merge conflict block is located at the wrong place? Eugen Konkov
2025-03-23 9:08 ` brian m. carlson
2025-03-24 5:39 ` 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=xmqqsen3oumi.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kes-kes@yandex$(echo .)ru \
--cc=sandals@crustytoothpaste$(echo .)net \
/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