check out the target branch

Author: brown9804

.github/workflows/use-visitor-counter.yml

@@ -57,36 +57,28 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      # Pre-commit changes before any branch switching to avoid overwriting local changes
-      - name: Pre-commit local changes
+      # Checkout to correct branch before commit
+      - name: Checkout to correct branch (PR or main)
         run: |
-          git add "*.md" metrics.json || true
-          git commit -m "Auto-commit local changes before branch switch" || echo "No changes to commit"
+          BRANCH="${{ github.head_ref || github.ref_name }}"
+          git fetch origin
+          git checkout "$BRANCH" || git checkout -b "$BRANCH" "origin/$BRANCH"
 
-      # Commit and push logic for PR events (merge, not rebase)
-      - name: Commit and push changes (PR)
-        if: github.event_name == 'pull_request'
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Pre-commit local changes
         run: |
-          git fetch origin
-          git checkout ${{ github.head_ref }}
-          git pull origin ${{ github.head_ref }} || echo "No merge needed"
-          git add "*.md" metrics.json
-          git commit -m "Update visitor count" || echo "No changes to commit"
-          git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-          git push origin HEAD:${{ github.head_ref }}
+          # Only add files that exist
+          [ -f metrics.json ] && git add metrics.json || true
+          git add "*.md" || true
+          git commit -m "Auto-commit local changes before pull/merge" || echo "No changes to commit"
 
-      # Commit and push logic for non-PR events (merge, not rebase)
-      - name: Commit and push changes (non-PR)
-        if: github.event_name != 'pull_request'
+      - name: Pull (merge) and push changes
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git fetch origin
-          git checkout ${{ github.ref_name }} || git checkout -b ${{ github.ref_name }} origin/${{ github.ref_name }}
-          git pull origin ${{ github.ref_name }} || echo "No merge needed"
-          git add "*.md" metrics.json
-          git commit -m "Update visitor count" || echo "No changes to commit"
+          BRANCH="${{ github.head_ref || github.ref_name }}"
           git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-          git push origin HEAD:${{ github.ref_name }}
+          git pull origin "$BRANCH" || echo "No merge needed"
+          [ -f metrics.json ] && git add metrics.json || true
+          git add "*.md" || true
+          git commit -m "Update visitor count" || echo "No changes to commit"
+          git push origin HEAD:"$BRANCH"