[Merge] trying ours

SakulFlee · Jun 20, 2023 · 4b885c8 · 4b885c8
1 parent 13aa557
commit 4b885c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/upstream_merger.yml b/.github/workflows/upstream_merger.yml
@@ -42,7 +42,7 @@ jobs:
  git fetch --all
 
  echo "> Merging ..."
- git merge -s ort -Xtheirs upstream/main origin/main
+ git merge -s ours upstream/main origin/main
 
  echo "> Pushing ..."
  git add --all || true