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

Author: aduh95

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

@@ -1,4 +1,4 @@
-name: Update Nock files
+name: Update Nock file
 
 on:
   workflow_dispatch:
@@ -11,41 +11,57 @@ on:
         description: Commit SHA of the head of the PR branch (only required for PRs from forks)
         type: string
         required: false
+      fix_conflicts:
+        description: Tick this if there are conflicts on the nock file on the targeted PR
+        type: boolean
+        required: false
 
 env:
   YARN_ENABLE_GLOBAL_CACHE: false
 
+permissions:
+  contents: read
+
 jobs:
   build-and-update-nock-files:
     permissions:
       contents: write
+      pull-requests: read
     runs-on: ubuntu-latest
 
     steps:
-      - name: Get PR info
-        id: pr_info
+      - name: Reject if SHA was not provided for PR from forks
+        if: ${{ !inputs.head_sha }}
         run: |
-          {
-            echo 'DATA<<""EOF""'
-            gh api \
-              -H "Accept: application/vnd.github+json" \
-              /repos/${{ github.repository }}/pulls/${{ inputs.pr_id }} \
-              --jq '{ repo: .head.repo.full_name, clone_url: .head.repo.clone_url, head_sha: .head.sha, head_ref: .head.ref }'
-            echo '""EOF""'
-          } >> "$GITHUB_OUTPUT"
+          set -x
+          [ "$(gh pr view "$GITHUB_SERVER/$GITHUB_REPOSITORY/pull/$PR_ID" \
+            --json headRepositoryOwner --jq '.headRepositoryOwner.name') = "$GITHUB_REPOSITORY_OWNER" ]
         env:
+          PR_ID: ${{ inputs.pr_id }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Validate HEAD SHA
-        if: ${{ fromJson(steps.pr_info.outputs.DATA).repo != github.repository || inputs.head_sha }}
-        run: >
-          [[ "$EXPECTED" == "$ACTUAL" ]] || exit 1
-        env:
-          ACTUAL: ${{ fromJson(steps.pr_info.outputs.DATA).head_sha }}
-          EXPECTED: ${{ inputs.head_sha }}
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
         with:
-          ref: ${{ fromJson(steps.pr_info.outputs.DATA).head_sha }}
+          ref: refs/pulls/${{ inputs.pr_id }}/head
+
+      - name: Verify if provided SHA matches PR head
+        if: ${{ inputs.head_sha }}
+        run: |
+          set -x
+          [ "$EXPECTED" = "$(git rev-parse HEAD)" ]
+        env:
+          EXPECTED: ${{ inputs.head_sha }}
+
+      - name: Git config
+        run: |
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[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
 
       - name: Install Node
         uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
@@ -90,16 +106,11 @@ jobs:
         if: ${{ steps.contains-changes.outputs.result == 'yes' }}
         run: |
           git add tests/nocks.db
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
           git commit -m "update Nock files"
 
       - name: Push changes
-        if: ${{ steps.contains-changes.outputs.result == 'yes' }}
-        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 }}
+        if: ${{ steps.contains-changes.outputs.result == 'yes' || inputs.fix_conflicts }}
+        run: git push
 
       - name: Upload `tests/nocks.db` in case of failure
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2