Merge with main - auto-resolved

resolve.sh

@@ -39,51 +39,46 @@ resolve_gitattributes() {
     
     git checkout pr/$pr_num 2>/dev/null
     
-    # Check if there are any conflicts
-    if ! git status --porcelain | grep -q "^UU"; then
-        echo "  ℹ️  No conflicts found in PR #$pr_num"
-        return 0
-    fi
-    
-    # Check if .gitattributes has conflicts
-    if ! git status --porcelain | grep -q "^UU .gitattributes"; then
-        echo "  ℹ️  No .gitattributes conflicts in PR #$pr_num"
-        return 0
-    fi
-    
-    echo "  🔧 Resolving .gitattributes conflict..."
+    # Try to merge with main to trigger any conflicts
+    echo "  🔄 Attempting merge with main..."
+    merge_output=$(git merge main 2>&1)
+    merge_status=$?
     
-    # Auto-resolve .gitattributes by taking both sides and removing duplicates
-    # This assumes the conflict is just duplicate LFS entries
-    if [ -f .gitattributes ]; then
-        # Remove conflict markers and duplicate lines
-        grep -v "^<<<<<<<" .gitattributes | \
-        grep -v "^=======" | \
-        grep -v "^>>>>>>>" | \
-        sort -u > .gitattributes.tmp
-        
-        mv .gitattributes.tmp .gitattributes
-        
-        # Stage the resolved file
-        git add .gitattributes
+    if [ $merge_status -eq 0 ]; then
+        echo "  ℹ️  No conflicts found in PR #$pr_num (merge successful)"
+    else
+        echo "  🔧 Merge conflicts detected, resolving..."
         
-        # Commit the resolution
-        if git commit -m "Resolve .gitattributes merge conflict - auto-resolved" 2>/dev/null; then
-            echo "  ✅ Conflict resolved and committed"
+        # Check if .gitattributes has conflicts and resolve them
+        if [ -f .gitattributes ] && grep -q "^<<<<<<<" .gitattributes; then
+            echo "  🔧 Resolving .gitattributes conflict..."
+            # Remove conflict markers and duplicate lines
+            grep -v "^<<<<<<<" .gitattributes | \
+            grep -v "^=======" | \
+            grep -v "^>>>>>>>" | \
+            sort -u > .gitattributes.tmp
             
-            # Push back to HF
-            if git push origin pr/$pr_num:refs/pr/$pr_num 2>/dev/null; then
-                echo "  ✅ Successfully pushed to HuggingFace PR #$pr_num"
-            else
-                echo "  ❌ Failed to push to HuggingFace PR #$pr_num"
-                return 1
-            fi
-        else
-            echo "  ❌ Failed to commit resolution for PR #$pr_num"
-            return 1
+            mv .gitattributes.tmp .gitattributes
         fi
+    fi
+    
+    # Always stage all files and commit/push regardless of merge status
+    echo "  📦 Staging all files..."
+    git add .
+    
+    # Commit (this will work whether there were conflicts or not)
+    if git commit -m "Merge with main - auto-resolved" 2>/dev/null; then
+        echo "  ✅ Changes committed"
+    else
+        echo "  ℹ️  No changes to commit (already up to date)"
+    fi
+    
+    # Always try to push
+    echo "  🚀 Pushing to HuggingFace..."
+    if git push origin pr/$pr_num:refs/pr/$pr_num 2>/dev/null; then
+        echo "  ✅ Successfully pushed to HuggingFace PR #$pr_num"
     else
-        echo "  ❌ .gitattributes file not found in PR #$pr_num"
+        echo "  ❌ Failed to push to HuggingFace PR #$pr_num"
         return 1
     fi