* Why merge conflict block is located at the wrong place?
@ 2025-03-22 23:16 Eugen Konkov
2025-03-23 9:08 ` brian m. carlson
0 siblings, 1 reply; 3+ messages in thread
From: Eugen Konkov @ 2025-03-22 23:16 UTC (permalink / raw)
To: Git Mailing List
Hello Git,
I got this merge conflict:
```
sub alter_field {
my ($from_field, $to_field, $options) = @_;
die "Can't alter field in another table"
if ($from_field->table->name ne $to_field->table->name);
<<<<<<< HEAD
my $generator = _generator($options);
my @out;
||||||| parent of 1bfbcdad (Introduce and use Postgres in-database schemas)
die "Can't alter field in another table"
if($from_field->table->name ne $to_field->table->name);
=======
die "Can't alter field in another table"
if($from_field->table->qualified_name ne $to_field->table->qualified_name);
>>>>>>> 1bfbcdad (Introduce and use Postgres in-database schemas)
# drop geometry column and constraints
push @out, drop_geometry_column($from_field, $options), drop_geometry_constraints($from_field, $options),
if is_geometry($from_field);
```
But I expect it to be like this:
```
sub alter_field {
my ($from_field, $to_field, $options) = @_;
<<<<<<< HEAD
die "Can't alter field in another table"
if ($from_field->table->name ne $to_field->table->name);
||||||| parent of 1bfbcdad (Introduce and use Postgres in-database schemas)
die "Can't alter field in another table"
if($from_field->table->name ne $to_field->table->name);
=======
die "Can't alter field in another table"
if($from_field->table->qualified_name ne $to_field->table->qualified_name);
>>>>>>> 1bfbcdad (Introduce and use Postgres in-database schemas)
my $generator = _generator($options);
my @out;
# drop geometry column and constraints
push @out, drop_geometry_column($from_field, $options), drop_geometry_constraints($from_field, $options),
if is_geometry($from_field);
```
Why merge conflict block is located at the wrong place?
git version 2.49.0
--
Best regards,
Eugen Konkov
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Why merge conflict block is located at the wrong place?
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
0 siblings, 1 reply; 3+ messages in thread
From: brian m. carlson @ 2025-03-23 9:08 UTC (permalink / raw)
To: Eugen Konkov; +Cc: Git Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Why merge conflict block is located at the wrong place?
2025-03-23 9:08 ` brian m. carlson
@ 2025-03-24 5:39 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2025-03-24 5:39 UTC (permalink / raw)
To: brian m. carlson; +Cc: Eugen Konkov, Git Mailing List
"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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-24 5:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox