Skip to content

Commit 06e2e06

Browse files
authored
Configure merge strategy for AzerothCore
1 parent 3177ba2 commit 06e2e06

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.github/workflows/auto-merge.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- name: Merge AzerothCore
2424
run: |
2525
git status
26+
git config merge.ours.driver true
2627
git config user.name "github-actions[bot]"
2728
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
2829
git remote add AC https://github.com/azerothcore/azerothcore-wotlk.git

0 commit comments

Comments
 (0)