fix

Author: sam0x17

.github/workflows/require-clean-merges.yml

@@ -20,6 +20,9 @@ jobs:
         id: set-merge-branches
         run: |
           TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
+          PR_BRANCH="${{ github.event.pull_request.head.ref }}"
+          echo "PR_BRANCH=$PR_BRANCH" >> $GITHUB_ENV
+
           if [[ "$TARGET_BRANCH" == "devnet-ready" ]]; then
             echo "MERGE_BRANCHES=devnet testnet main" >> $GITHUB_ENV
           elif [[ "$TARGET_BRANCH" == "devnet" ]]; then
@@ -35,21 +38,25 @@ jobs:
       - name: Check Merge Cleanliness
         run: |
           TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
+          PR_BRANCH="${{ github.event.pull_request.head.ref }}"
           echo "Fetching all branches..."
           git fetch --all --prune
 
+          echo "Checking out PR branch: $PR_BRANCH"
+          git checkout $PR_BRANCH
+          git reset --hard origin/$PR_BRANCH
+
           for branch in $MERGE_BRANCHES; do
-            echo "Checking merge from $branch into $TARGET_BRANCH..."
+            echo "Checking merge from $branch into $PR_BRANCH..."
             
-            # Ensure we are on the target branch and reset to its latest remote state
-            git checkout $TARGET_BRANCH
-            git reset --hard origin/$TARGET_BRANCH
+            # Ensure PR branch is up to date
+            git reset --hard origin/$PR_BRANCH
 
             # Merge without committing to check for conflicts
             if git merge --no-commit --no-ff origin/$branch; then
-              echo "✅ Merge from $branch into $TARGET_BRANCH is clean."
+              echo "✅ Merge from $branch into $PR_BRANCH is clean."
             else
-              echo "❌ Merge conflict detected when merging $branch into $TARGET_BRANCH"
+              echo "❌ Merge conflict detected when merging $branch into $PR_BRANCH"
               exit 1
             fi