From 65023c92eb7d7dd54aca0ddbf5da28676c5d260f Mon Sep 17 00:00:00 2001
From: Andrew Richards <40760786+AndrewRichards-Code@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:26:21 +0100
Subject: [PATCH] Update MergeMainIntoConsole.yml

Runs only on main and uses merge and not pull.
---
 .github/workflows/MergeMainIntoConsole.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MergeMainIntoConsole.yml b/.github/workflows/MergeMainIntoConsole.yml
index 8aa90683..7558d3c8 100644
--- 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 "bot@example.com"
         git config pull.rebase false
-        git pull ${{env.MAIN_REPO}} ${{env.MAIN_BRANCH}}
-        git push
\ No newline at end of file
+        git merge ${{env.MAIN_REPO}} ${{env.MAIN_BRANCH}}
+        git push