ci: rebase docs sync with source preference

This commit is contained in:
Peter Steinberger
2026-04-24 18:58:52 +01:00
parent f07b00de66
commit 7a63dd3f12

View File

@@ -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