Update global-npm-resolve-conflicting-files-fix.yml

.github/workflows/global-npm-resolve-conflicting-files-fix.yml

@@ -20,20 +20,30 @@ jobs:
         with:
           node-version: '20'
 
+      - name: Setup git
+        run: |
+          git config --global user.email "qdraw@users.noreply.github.com"
+          git config --global user.name "Global npm resolve conflicting files fix script"
+          
       - name: Merge master into branch
         run: |
           git fetch origin
           git checkout ${{ github.head_ref }}
-          git merge origin/master || true
+          git merge origin/master --strategy=ours --allow-unrelated-histories
 
       - name: Resolve package-lock.json conflicts
         run: |
           for project in ${{ steps.define-projects.outputs.projects }}; do
-            git diff --exit-code $project/package-lock.json > /dev/null || (
+            echo "Checking for conflicts in $project/package-lock.json"
+            if ! git diff --exit-code $project/package-lock.json > /dev/null; then
+              echo "Conflicts detected in $project/package-lock.json"
               git checkout --theirs $project/package-lock.json
               npm install --prefix $project
               git add $project/package-lock.json
-            )
+              echo "Conflicts resolved and changes added for $project/package-lock.json"
+            else
+              echo "No conflicts detected in $project/package-lock.json"
+            fi
           done
           git diff-index --quiet HEAD || git commit -m "Resolve package-lock.json conflicts"
 
@@ -42,22 +52,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git push origin HEAD:$(echo $GITHUB_REF | sed 's/refs\/heads\///')
-
-      - name: Merge PR if possible
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { data: pullRequest } = await github.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.issue.number,
-            });
-
-            if (pullRequest.mergeable) {
-              await github.pulls.merge({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.issue.number,
-              });
-            }