Update generate-repo-summary.yml

Author: soodoku

.github/workflows/generate-repo-summary.yml

@@ -15,13 +15,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.MY_GITHUB_TOKEN }}
+          # Add this to fetch all history for proper merging
+          fetch-depth: 0
 
       - name: Create data directory
         run: |
-          # Create _data directory and show results
+          # Create _data directory with exact name (no asterisks)
           mkdir -p _data
-          echo "Created _data directory:"
-          ls -la | grep _data
+          echo "Created _data directory"
       
       - name: Generate Repository Summaries
         uses: gojiplus/generator@v3
@@ -32,36 +33,20 @@ jobs:
 
       - name: Copy output file
         run: |
-          # Verify _data directory exists
-          if [ ! -d "_data" ]; then
-            echo "Creating _data directory again"
-            mkdir -p _data
-          fi
-          
-          # Copy the file with verbose output
+          # Copy to the proper directory (no asterisks)
           cp -v repo_summaries.json _data/generated_data.json
-          
-          # Verify the file was copied
-          ls -la _data/
       
       - name: Commit and push changes
         run: |
           git config --global user.name "GitHub Actions Bot"
           git config --global user.email "[email protected]"
           
-          # Verify file exists before adding
-          if [ ! -f "_data/generated_data.json" ]; then
-            echo "ERROR: Output file not found!"
-            exit 1
-          fi
+          # Pull latest changes first to resolve conflicts
+          git pull origin main
           
-          # Add and commit the file
+          # Add the file with proper path (no asterisks)
           git add _data/generated_data.json
           
-          # Check if there are changes to commit
-          if git diff --staged --quiet; then
-            echo "No changes to commit"
-          else
-            git commit -m "Auto-update repository summary data"
-            git push
-          fi
+          # Commit and push with conflict resolution
+          git diff --staged --quiet || git commit -m "Auto-update repository summary data"
+          git push