From d30e7a0169adc4cfe6e2229e8352b0c756b1c077 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Sat, 6 Apr 2024 16:49:24 +0800 Subject: [PATCH] fix(deploy): error: The branch 'full' is not fully merged. --- fdroidserver/deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py index a17d7468..2dcfb4d9 100644 --- a/fdroidserver/deploy.py +++ b/fdroidserver/deploy.py @@ -793,7 +793,7 @@ def update_servergitmirrors(servergitmirrors, repo_section): # Switch to the initial branch and unstage all files repo.head.reference = initial_branch_ref repo.head.reset(index=True, working_tree=False) - repo.delete_head(repo.branches[branch_name]) + repo.delete_head(repo.branches[branch_name], force=True) if progress: progressbar.done()