Update merge strategy in sync-upstream workflow

Modified the merge command to prioritize "ours" strategy during conflicts, ensuring local changes take precedence automatically. This streamlines the merging process and reduces the risk of manual intervention for conflict resolution.

Author: urban233

.github/workflows/sync-upstream.yaml

@@ -53,7 +53,9 @@ jobs:
       - name: Merge upstream/${{ env.UPSTREAM_BRANCH }} into unstable
         run: |
           set -e
-          git merge --no-ff --no-edit upstream/${{ env.UPSTREAM_BRANCH }} || {
+#          git merge -s recursive -X ours upstream/${{ env.UPSTREAM_BRANCH }} || echo "Merge completed with our changes"
+#          git merge --no-ff --no-edit upstream/${{ env.UPSTREAM_BRANCH }} || {
+          git merge -s recursive -X ours upstream/${{ env.UPSTREAM_BRANCH }} || {
             echo "❌ Merge conflict. Please resolve manually." >&2
             git merge --abort || true
             exit 1