chore(sync): auto-resolve upstream-preferred conflicts

Author: tae898

sync-upstream.sh

@@ -22,21 +22,45 @@ FORK_OWNED_PATHS=(
     "CLAUDE.md"
 )
 
+# Upstream-owned files that may conflict because equivalent upstream commits were
+# previously imported into the fork with different commit ancestry. In these
+# cases we want the exact upstream version during sync.
+UPSTREAM_PREFERRED_PATHS=(
+    "engine/src/main/java/com/arcadedb/utility/RidHashSet.java"
+)
+
 PROTECTED_SOURCE_REV=""
 
 try_auto_resolve() {
-    local conflicts resolved
+    local conflicts resolved path handled
     conflicts=$(git status --porcelain | awk '$1 ~ /U/ {print $2}')
     if [ -z "$conflicts" ]; then
         return 1
     fi
     resolved=0
     for path in $conflicts; do
+        handled=0
         for protected_path in "${FORK_OWNED_PATHS[@]}"; do
             if [[ "$path" == "$protected_path" ]]; then
                 git checkout --ours -- "$path"
                 git add "$path"
                 resolved=1
+                handled=1
+                break
+            fi
+        done
+
+        if [ "$handled" -eq 1 ]; then
+            continue
+        fi
+
+        for upstream_path in "${UPSTREAM_PREFERRED_PATHS[@]}"; do
+            if [[ "$path" == "$upstream_path" ]]; then
+                echo -e "${CYAN}ℹ️  Auto-resolving upstream-preferred conflict: $path${NC}"
+                git checkout --theirs -- "$path"
+                git add "$path"
+                resolved=1
+                handled=1
                 break
             fi
         done