From 837244940c342c50c21d07196d29b79a26cb4611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Thu, 6 Nov 2025 16:49:48 +0800
Subject: [PATCH] =?UTF-8?q?chore(git):=20main=20=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=20develop=20=E5=88=86=E6=94=AF,=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E6=97=B6=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8develop?=
 =?UTF-8?q?=20=E5=88=86=E6=94=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/tag-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tag-push.yml b/.github/workflows/tag-push.yml
index 634f6ad74..87a1a3d3f 100644
--- a/.github/workflows/tag-push.yml
+++ b/.github/workflows/tag-push.yml
@@ -55,5 +55,5 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git status
           git fetch origin
-          git merge origin/develop
+          git merge origin/develop -X theirs
           git push origin main