git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Why merge conflict block is located at the wrong place?

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 24, 2025, 05:39 UTC
Message-ID
<xmqqsen3oumi.fsf@gitster.g>
In-Reply-To
<Z9_Pkb7N1J_J9ECo@tapette.crustytoothpaste.net>
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
Show 11 quoted lines
> 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.

Previous: brian m. carlson
Message 3 of 3 in “Why merge conflict block is located at the wrong place?”
  1. Eugen KonkovMar 22, 2025
  2. brian m. carlsonMar 23, 2025
  3. Junio C HamanoMar 24, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.