GNU bug report logs - #76654
Request for merging "go-team" branch

Previous Next

Full log

View this message in rfc822 format

From: Andreas Enge <andreas <at> enge.fr>
To: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Cc: ~@wolfsden.cz, 76654 <at> debbugs.gnu.org
Subject: [bug#76654] Request for merging "go-team" branch
Date: Wed, 14 May 2025 12:18:57 +0200

Hello,

as this branch is moving up in the queue, I tried to rebase it on
   5f5d84beccc180f1b51474c0e47eb6e0d0c9175f
but got a merge conflict in buildah:
<<<<<<< HEAD
           go-1.23
           go-github-com-go-md2man
=======
           go-1.22
           go-md2man
>>>>>>> 234a6dff9a (gnu: go-github-com-go-md2man: Package executable separately.)

It does not look difficult to resolve, but I think you are better placed
to understand what the good solution is.

Thanks!

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.