fix: Improve reliability of Spec File Update Workflow (#1278)

Author: davidkna-sap

.github/workflows/spec-update.yaml

@@ -74,7 +74,7 @@ jobs:
           BRANCH="spec-update/$CHOICE/$REF"
           git fetch origin $BRANCH || true
           git checkout -B $BRANCH origin/$BRANCH || git checkout -b $BRANCH
-          git rebase origin/main
+          git rebase -X theirs origin/main
           git push --force --set-upstream origin $BRANCH
           echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"