From 29f526242da271f779d8f3e6d5f37f5bf9b8c719 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Fri, 20 Jun 2025 10:45:22 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E8=87=AA=E5=8A=A8=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=88=B0main=E7=9A=84=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/auto-merge.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 0c12579..f548d8b 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -7,24 +7,6 @@ on:
   workflow_dispatch: # 手动触发
 
 jobs:
-  merge-to-main:
-    name: Merge base into main
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
-
-      - name: Merge base into main
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout main
-          git merge base --no-ff -m "Auto merge base into main"
-          git push origin main
-
   merge-to-i18n:
     name: Merge base into i18n
     runs-on: ubuntu-latest