From 376072171d838f28d418242d3f3517f93463681f Mon Sep 17 00:00:00 2001
From: "firedcto@gmail.com" <firedcto@gmail.com>
Date: Fri, 15 Nov 2024 10:04:41 +0800
Subject: [PATCH] auto merge code to pr branch

---
 .../workflows/merge_master_to_pr_branch.yml   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/merge_master_to_pr_branch.yml

diff --git a/.github/workflows/merge_master_to_pr_branch.yml b/.github/workflows/merge_master_to_pr_branch.yml
new file mode 100644
index 0000000..a1b3874
--- /dev/null
+++ b/.github/workflows/merge_master_to_pr_branch.yml
@@ -0,0 +1,27 @@
+name: Merge master into pull request
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Fetch all branches
+        run: git fetch --all
+
+      - name: Merge master into pull request
+        run: |
+          git checkout ${{ github.event.pull_request.head.ref }}
+          git merge origin/master
+
+      - name: Push changes
+        run: git push origin HEAD:${{ github.event.pull_request.head.ref }}
+        if: success()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}