From: Christian Weisgerber <naddy@mips.inka.de>
Subject: merge chokes, creates bogus conflicts
To: gameoftrees@openbsd.org
Date: Wed, 15 Feb 2023 16:35:44 +0100

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

There is an easily missed error message "got: cannot commit file
in conflicted status" in the copious merge output.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de