Update Pull from Upstream and Merge PRs.yml

Author: soultaco83

.github/workflows/Pull from Upstream and Merge PRs.yml

@@ -148,10 +148,10 @@ jobs:
             PR_NUMBER=$(echo $PR_NUMBER | xargs)  # Trim whitespace
             
             # Check if PR is already merged upstream
-            if git log upstream/master --grep="Merge pull request #$PR_NUMBER" --oneline | grep -q "#$PR_NUMBER"; then
-              echo "✓ PR #$PR_NUMBER is already merged upstream" >> pr_status.txt
+            if git log upstream/master --grep="Merge pull request $PR_NUMBER" --oneline | grep -q "$PR_NUMBER"; then
+              echo "✓ PR $PR_NUMBER is already merged upstream" >> pr_status.txt
             else
-              echo "○ PR #$PR_NUMBER needs to be merged" >> pr_status.txt
+              echo "○ PR $PR_NUMBER needs to be merged" >> pr_status.txt
               echo "$PR_NUMBER" >> prs_to_merge.txt
             fi
           done
@@ -171,30 +171,30 @@ jobs:
           echo "" >> merge_results.txt
           
           while IFS= read -r PR_NUMBER; do
-            echo "Processing PR #$PR_NUMBER"
+            echo "Processing PR $PR_NUMBER"
             
             # Fetch the PR branch
             if git fetch upstream pull/$PR_NUMBER/head:pr-$PR_NUMBER; then
-              echo "Fetched PR #$PR_NUMBER successfully"
+              echo "Fetched PR $PR_NUMBER successfully"
               
               # Check if this PR can be merged
               MERGE_BASE=$(git merge-base HEAD pr-$PR_NUMBER)
               if git merge-tree $MERGE_BASE HEAD pr-$PR_NUMBER | grep -q '^<<<<<<<'; then
-                echo "⚠️  PR #$PR_NUMBER would cause conflicts - skipping" >> merge_results.txt
+                echo "⚠️  PR $PR_NUMBER would cause conflicts - skipping" >> merge_results.txt
               else
                 # Try to merge the PR
-                if git merge pr-$PR_NUMBER --no-ff -m "Merge PR #$PR_NUMBER"; then
-                  echo "✅ Merged PR #$PR_NUMBER successfully" >> merge_results.txt
+                if git merge pr-$PR_NUMBER --no-ff -m "Merge PR $PR_NUMBER"; then
+                  echo "✅ Merged PR $PR_NUMBER successfully" >> merge_results.txt
                   
                   # Clean up the PR branch
                   git branch -D pr-$PR_NUMBER
                 else
-                  echo "❌ Failed to merge PR #$PR_NUMBER (unexpected error)" >> merge_results.txt
+                  echo "❌ Failed to merge PR $PR_NUMBER (unexpected error)" >> merge_results.txt
                   git merge --abort
                 fi
               fi
             else
-              echo "❌ Failed to fetch PR #$PR_NUMBER (PR may not exist or is closed)" >> merge_results.txt
+              echo "❌ Failed to fetch PR $PR_NUMBER (PR may not exist or is closed)" >> merge_results.txt
             fi
           done < prs_to_merge.txt