Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Change auto-merge action to merge not rebase
Browse files Browse the repository at this point in the history
Same goal achieved in keeping fork up to date but rebase doesn't display changes in Discord via bot post.
  • Loading branch information
Niam5 committed Oct 11, 2023
1 parent 9af8abf commit b14395f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
git config user.email "[email protected]" && 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: |
Expand Down

0 comments on commit b14395f

Please sign in to comment.