From 9786f0988bbd2fcb0192158e26a410ae085f37d7 Mon Sep 17 00:00:00 2001
From: taoria <445625470@qq.com>
Date: Sat, 13 Aug 2022 00:13:09 +0800
Subject: [PATCH] Create auto merge file

create another auto merge file
---
 .github/workflows/merge.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/merge.yml

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
new file mode 100644
index 0000000..03028a8
--- /dev/null
+++ b/.github/workflows/merge.yml
@@ -0,0 +1,31 @@
+# This is a basic workflow that is manually triggered
+
+name: Manual workflow
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  push:
+    branches:
+      'work-in-progress'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "merge"
+  merge:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Runs a single command using the runners shell
+    - name: Up merge
+      # You may pin to the exact commit or the version.
+      # uses: bambamboole/gha-upmerge@de87b212278009f9ace0ba024701890b9eb3281b
+      uses: bambamboole/gha-upmerge@v1.0.1
+      with:
+        # Name of the branch to merge from
+        from_branch: work-in-progress
+
+        to_branch: main
+