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

Why merge conflict block is located at the wrong place?

From
EKEugen Konkov <kes-kes@yandex.ru>
Date
Mar 22, 2025, 23:16 UTC
Message-ID
<1145598425.20250322191649@yandex.ru>
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
Next: brian m. carlson
Message 1 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.