From b14395f230bf0ade575007492c2b8fc9e35b9baa Mon Sep 17 00:00:00 2001 From: Niam5 Date: Wed, 11 Oct 2023 17:09:06 -0500 Subject: [PATCH] Change auto-merge action to merge not rebase Same goal achieved in keeping fork up to date but rebase doesn't display changes in Discord via bot post. --- .github/workflows/auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 727c605679..7053c25b7c 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -18,7 +18,7 @@ jobs: git config user.email "niam5+ci@post.com" && git config user.name "Niam5" git remote add Cata https://github.com/The-Cataclysm-Preservation-Project/TrinityCore.git git fetch Cata master - git rebase Cata/master + git merge -m "Merge TheCataclysmPreservationProject to ElunaCataPreservation [skip ci]" Cata/master git status - name: Dependencies run: |