From: Stefan Sperling <stsp@stsp.name>
Subject: Re: merge chokes, creates bogus conflicts
To: Christian Weisgerber <naddy@mips.inka.de>
Cc: gameoftrees@openbsd.org
Date: Thu, 16 Feb 2023 01:17:02 +0100

On Wed, Feb 15, 2023 at 04:35:44PM +0100, Christian Weisgerber wrote:
> got merge chokes on the perl-5.36.0 commits to OpenBSD src.git and
> creates bogus conflicts.  Here's a script to reproduce this:
> 
>   git clone --bare https://github.com/openbsd/src.git
>   got co src.git
>   cd src
>   got br -c d122a78 local         # before perl-5.36.0 import
>   echo dummy >README
>   got add README
>   got ci -m 'local: dummy commit'
>   got up
>   got merge master
>   got st | grep '^[^MAD]'
> 
> C  gnu/usr.bin/perl/t/comp/parser.t
> C  gnu/usr.bin/perl/t/lib/croak/toke

The second file also contains conflict markers:

423: ########
424: # NAME multiple conflict markers
425: <<<<<<< yours:sample.txt
426: my $some_code;
427: =======
428: my $some_other_code;
429: >>>>>>> theirs:sample.txt
430: EXPECT
431: Version control conflict marker at - line 1, near "<<<<<<<"
432: Version control conflict marker at - line 3, near "======="
433: Version control conflict marker at - line 5, near ">>>>>>>"
434: Execution of - aborted due to compilation errors.
435: ########