From 6c6327382f180307ef1893bb4108cf7f3e701ff4 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Fri, 18 Oct 2024 15:23:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20branch=20=E5=BC=BA=E5=88=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E6=94=AF=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/geedge/asw/module/app/service/impl/GitServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
index c6c93a1..3cf9c54 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
@@ -198,6 +198,7 @@ public class GitServiceImpl implements IGitService {
         try (Git git = this.getGitInstance(repoDir)) {
             git.branchDelete()
                     .setBranchNames(branchName)
+                    .setForce(true)
                     .call();
         } catch (GitAPIException e) {
             log.error(e, "[deleteBranch] [error] [workspaceId: {}] [branchName: {}]", workspaceId, branchName);