mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-21 04:10:37 +02:00
fix(deploy): error: The branch 'full' is not fully merged.
This commit is contained in:
parent
d9984dbeea
commit
cd23cf659b
@ -602,7 +602,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()
|
||||
|
Loading…
Reference in New Issue
Block a user