Upload NGC0628-150pc_MAPS.fits

.gitattributes

@@ -235,5 +235,12 @@ NGC7496/hlsp_phangs-jwst_jwst_miri_ngc7496_f2100w_v1p0p1_img.fits filter=lfs dif
 NGC7496/hlsp_phangs-jwst_jwst_miri_ngc7496_f770w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC7496/hlsp_phangs-jwst_jwst_nircam_ngc7496_f200w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC7496/hlsp_phangs-jwst_jwst_nircam_ngc7496_f300m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
+<<<<<<< HEAD
 NGC7496/hlsp_phangs-jwst_jwst_nircam_ngc7496_f335m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC7496/hlsp_phangs-jwst_jwst_nircam_ngc7496_f360m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
+NGC0628/NGC0628-150pc_MAPS.fits filter=lfs diff=lfs merge=lfs -text
+=======
+wqNGC7496/hlsp_phangs-jwst_jwst_nircam_ngc7496_f335m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
+NGC7496/hlsp_phangs-jwst_jwst_nircam_ngc7496_f360m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
+IC5332/IC5332-150pc_MAPS.fits filter=lfs diff=lfs merge=lfs -text
+>>>>>>> main

resolve.sh

@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# Script to automatically resolve .gitattributes conflicts for multiple HuggingFace PRs
+# Usage: ./resolve-gitattributes-conflicts.sh <start_pr> <end_pr>
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <start_pr_number> <end_pr_number>"
+    echo "Example: $0 1 5"
+    exit 1
+fi
+
+START_PR=$1
+END_PR=$2
+
+# Validate inputs are numbers
+if ! [[ "$START_PR" =~ ^[0-9]+$ ]] || ! [[ "$END_PR" =~ ^[0-9]+$ ]]; then
+    echo "Error: PR numbers must be integers"
+    exit 1
+fi
+
+if [ $START_PR -gt $END_PR ]; then
+    echo "Error: Start PR number must be less than or equal to end PR number"
+    exit 1
+fi
+
+echo "Resolving .gitattributes conflicts for PRs $START_PR through $END_PR..."
+
+# Function to resolve gitattributes conflict
+resolve_gitattributes() {
+    local pr_num=$1
+    
+    echo "Processing PR #$pr_num..."
+    
+    # Fetch and checkout the PR
+    if ! git fetch origin refs/pr/$pr_num:pr/$pr_num 2>/dev/null; then
+        echo "  ❌ Failed to fetch PR #$pr_num (may not exist)"
+        return 1
+    fi
+    
+    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..."
+    
+    # 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
+        
+        # Commit the resolution
+        if git commit -m "Resolve .gitattributes merge conflict - auto-resolved" 2>/dev/null; then
+            echo "  ✅ Conflict resolved and committed"
+            
+            # 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
+        fi
+    else
+        echo "  ❌ .gitattributes file not found in PR #$pr_num"
+        return 1
+    fi
+    
+    return 0
+}
+
+# Main loop
+success_count=0
+total_count=0
+
+for pr_num in $(seq $START_PR $END_PR); do
+    total_count=$((total_count + 1))
+    
+    if resolve_gitattributes $pr_num; then
+        success_count=$((success_count + 1))
+    fi
+    
+    echo ""
+done
+
+# Summary
+echo "============================================"
+echo "Summary:"
+echo "  Total PRs processed: $total_count"
+echo "  Successfully resolved: $success_count"
+echo "  Failed: $((total_count - success_count))"
+echo "============================================"
+
+# Return to main branch
+git checkout main 2>/dev/null || git checkout master 2>/dev/null
+
+echo "Done! Returned to main branch."