From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Eugen Konkov <kes-kes@yandex.ru>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Why merge conflict block is located at the wrong place?
Date: Sun, 23 Mar 2025 09:08:33 +0000 [thread overview]
Message-ID: <Z9_Pkb7N1J_J9ECo@tapette.crustytoothpaste.net> (raw)
In-Reply-To: <1145598425.20250322191649@yandex.ru>
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
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?
--
brian m. carlson (they/them)
Toronto, Ontario, CA
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
next prev parent reply other threads:[~2025-03-23 9:08 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 [this message]
2025-03-24 5:39 ` Junio C Hamano
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=Z9_Pkb7N1J_J9ECo@tapette.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=kes-kes@yandex.ru \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).