From 847ec77992963542ba8137ebbe78eb511be3d6c3 Mon Sep 17 00:00:00 2001 From: Andrew Richards Date: Wed, 7 Aug 2024 08:40:18 +0100 Subject: [PATCH] Updated git merge command. --- .github/workflows/MergeMainIntoConsole.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MergeMainIntoConsole.yml b/.github/workflows/MergeMainIntoConsole.yml index 7558d3c8..fd40be7b 100644 --- a/.github/workflows/MergeMainIntoConsole.yml +++ b/.github/workflows/MergeMainIntoConsole.yml @@ -29,5 +29,5 @@ jobs: git config user.name "Automerge Bot" git config user.email "bot@example.com" git config pull.rebase false - git merge ${{env.MAIN_REPO}} ${{env.MAIN_BRANCH}} + git merge ${{env.MAIN_BRANCH}} git push