diff --git a/.github/workflows/upstream_merger.yml b/.github/workflows/upstream_merger.yml index 68bcd35..d385643 100644 --- 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