---
 testing/opendht/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/opendht/APKBUILD b/testing/opendht/APKBUILD
index f7cc39572c..9df84acb75 100644
--- a/testing/opendht/APKBUILD
+++ b/testing/opendht/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Gavin Henry <ghenry@sentrypeer.org>
 pkgname=opendht
 pkgver=2.3.5
-pkgrel=0
+pkgrel=1
 pkgdesc="C++14 Distributed Hash Table implementation"
 url="https://github.com/savoirfairelinux/opendht"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="cmake pkgconfig doxygen argon2-dev asio-dev gnutls-dev msgpack-c-dev nettle-dev readline-dev"
+makedepends="cmake pkgconfig argon2-dev asio-dev gnutls-dev msgpack-c-dev nettle-dev readline-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/savoirfairelinux/opendht/archive/refs/tags/$pkgver.tar.gz"
 
-- 
2.34.1

Hi!

We received your patch, but we were unable to apply it to the upstream
GitLab repository. Did you rebase?

Hi!

I set rebase as my default method for a git pull. I'm doing a fork and
will do a PR so I can check all the CI jobs.

Thanks.

As per:

https://wiki.alpinelinux.org/wiki/Creating_an_Alpine_package

alpine:~/aports$ cat .git/config
[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
[remote "origin"]
    url = https://gitlab.alpinelinux.org/alpine/aports
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
[sendemail]
    to = alpine-aports@lists.alpinelinux.org
[pull]
    rebase = true

https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/32246

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.

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.