From 7a63dd3f12b549ce98fb65f1ec88fe10f1e51d1f Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Fri, 24 Apr 2026 18:58:52 +0100 Subject: [PATCH] ci: rebase docs sync with source preference --- .github/workflows/docs-sync-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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