Update MergeMainIntoConsole.yml

Runs only on main and uses merge and not pull.
simul · Aug 6, 2024 · 65023c9 · 65023c9
1 parent 6545898
commit 65023c9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/MergeMainIntoConsole.yml b/.github/workflows/MergeMainIntoConsole.yml
@@ -3,6 +3,8 @@ name: Merge main into console
 
 on:
   push:
+    branches:
+      - main
   workflow_dispatch:
 
 env:
@@ -27,5 +29,5 @@ jobs:
         git config user.name "Automerge Bot"
         git config user.email "[email protected]"
         git config pull.rebase false
-        git pull ${{env.MAIN_REPO}} ${{env.MAIN_BRANCH}}
-        git push
+        git merge ${{env.MAIN_REPO}} ${{env.MAIN_BRANCH}}
+        git push