fixup! chore(ci): add conflict resolver to Update Nock file workflow

Author: aduh95

.github/workflows/update-nock-files.yml

@@ -34,15 +34,16 @@ jobs:
         if: ${{ !inputs.head_sha }}
         run: |
           set -x
-          [ "$(gh pr view "$GITHUB_SERVER/$GITHUB_REPOSITORY/pull/$PR_ID" \
-            --json headRepositoryOwner --jq '.headRepositoryOwner.name') = "$GITHUB_REPOSITORY_OWNER" ]
+          [ "$(gh pr view "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$PR_ID" \
+            --json headRepositoryOwner --jq '.headRepositoryOwner.name')" = "$GITHUB_REPOSITORY_OWNER" ]
         env:
           PR_ID: ${{ inputs.pr_id }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
         with:
-          ref: refs/pulls/${{ inputs.pr_id }}/head
+          ref: refs/pull/${{ inputs.pr_id }}/head
+          fetch-depth: ${{ !inputs.fix_conflicts && 1 || 0 }}
 
       - name: Verify if provided SHA matches PR head
         if: ${{ inputs.head_sha }}
@@ -52,16 +53,31 @@ jobs:
         env:
           EXPECTED: ${{ inputs.head_sha }}
 
-      - name: Git config
+      - name: Get PR info
+        id: pr_info
         run: |
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
+          {
+            echo 'DATA<<""EOF""'
+            gh api \
+              -H "Accept: application/vnd.github+json" \
+              /repos/$GITHUB_REPOSITORY/pulls/$PR_ID \
+              --jq '{ clone_url: .head.repo.clone_url, base_ref: .base.ref, head_ref: .head.ref }'
+            echo '""EOF""'
+          } >> "$GITHUB_OUTPUT"
+        env:
+          PR_ID: ${{ inputs.pr_id }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup git author
+        run: |
+          git config --local user.email "github-bot@iojs.org"
+          git config --local user.name "Node.js GitHub Bot"
 
       - name: Merge base branch
         if: ${{ inputs.fix_conflicts }}
-        run: |
-          git fetch "$GITHUB_SERVER/$GITHUB_REPOSITORY.git" HEAD
-          git merge FETCH_HEAD --no-edit -s ours
+        run: git merge "origin/$BASE_BRANCH" --no-edit -X theirs
+        env:
+          BASE_BRANCH: ${{ fromJson(steps.pr_info.outputs.DATA).base_ref }}
 
       - name: Install Node
         uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
@@ -110,7 +126,10 @@ jobs:
 
       - name: Push changes
         if: ${{ steps.contains-changes.outputs.result == 'yes' || inputs.fix_conflicts }}
-        run: git push
+        run: git push "$REMOTE" "HEAD:refs/heads/$REMOTE_REF"
+        env:
+          REMOTE: ${{ fromJson(steps.pr_info.outputs.DATA).clone_url }}
+          REMOTE_REF: ${{ fromJson(steps.pr_info.outputs.DATA).head_ref }}
 
       - name: Upload `tests/nocks.db` in case of failure
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2