From 05feffc4ae0b26b0c58cc3d23c0559d854123277 Mon Sep 17 00:00:00 2001
From: longbiao_wu <615944323@qq.com>
Date: Fri, 25 Oct 2024 16:16:27 +0800
Subject: [PATCH] chore: github workflow

---
 .github/workflows/release.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4214f61..f9ce84f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,5 +68,11 @@ jobs:
           git config user.name "ajiu9"
           git config user.email "615944323@qq.com"
           git checkout main
-          git merge release --no-ff -m "Merge release into main" --allow-unrelated-histories
+          git merge release --no-ff -m "Merge release into main" --allow-unrelated-histories || true
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "Conflicts detected. Resolving conflicts..."
+            # 手动解决冲突
+            git add .
+            git commit -m "Resolve merge conflicts"
+          fi
           git push origin main