From nobody Thu Mar 28 20:03:28 2024 Received: from vps892.directvps.nl (ikke.info [178.21.113.177]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id A443E781379 for ; Sat, 19 Mar 2022 12:54:06 +0000 (UTC) Received: by vps892.directvps.nl (Postfix, from userid 1008) id 7062F440102; Sat, 19 Mar 2022 13:54:05 +0100 (CET) Date: Sat, 19 Mar 2022 13:54:05 +0100 From: Kevin Daudt To: Gavin Henry Cc: Alpine Linux , alpine-aports@lists.alpinelinux.org Subject: Re: [PATCH] testing/opendht: remove doxygen Message-ID: References: <20220319094251.13086-1-ghenry@sentrypeer.org> <164768299178.985.5627405972623994523@listserv.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Sat, Mar 19, 2022 at 10:31:10AM +0000, Gavin Henry wrote: > New clean merge request: > > https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/32251 > > I must be misunderstanding how gitlab is doing these as it keeps > failing with a rebase issue. It's a fresh fork of aports and a basic > merge request. Any ideas? > > Thanks. If you mean this message: > Merge blocked: the source branch must be rebased onto the target > branch. Then that's normal. It will get a final rebase right before it gets merged.