We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3177ba2 commit 06e2e06Copy full SHA for 06e2e06
.github/workflows/auto-merge.yml
@@ -23,6 +23,7 @@ jobs:
23
- name: Merge AzerothCore
24
run: |
25
git status
26
+ git config merge.ours.driver true
27
git config user.name "github-actions[bot]"
28
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
29
git remote add AC https://github.com/azerothcore/azerothcore-wotlk.git
0 commit comments