diff --git a/.github/workflows/docs-sync-publish.yml b/.github/workflows/docs-sync-publish.yml index 0c431710b10..0e367bc6003 100644 --- a/.github/workflows/docs-sync-publish.yml +++ b/.github/workflows/docs-sync-publish.yml @@ -97,7 +97,7 @@ jobs: for attempt in 1 2 3 4 5; do if git fetch origin main:refs/remotes/origin/main; then skip_stale_source - if git rebase origin/main && git push origin HEAD:main; then + if git rebase -X theirs origin/main && git push origin HEAD:main; then exit 0 fi fi