Merge main into dev-sync-with-main

Author: github-actions[bot]

.github/workflows/sync-dev-to-vX.Y-dev.yaml

@@ -44,7 +44,7 @@ jobs:
             SYNC="$BASE-sync-with-$HEAD"
 
             git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
-            git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
+            git merge -X theirs origin/$HEAD -m "Merge $HEAD into $SYNC"
             git checkout origin/$BASE src/
             git checkout origin/$BASE tests/schema/
             git commit -m "Restored src/ and tests/schema/" || echo ""

.github/workflows/sync-main-to-dev.yaml

@@ -40,7 +40,7 @@ jobs:
           SYNC="$BASE-sync-with-$HEAD"
 
           git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
-          git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
+          git merge -X theirs origin/$HEAD -m "Merge $HEAD into $SYNC"
           git checkout origin/$BASE src/
           git checkout origin/$BASE tests/schema/
           git commit -m "Restored src/ and tests/schema/" || echo ""