Merge rocm-main into the CI branch to avoid running old CI code

.github/workflows/rocm-nightly-upstream-sync.yml

@@ -13,20 +13,15 @@ env:
   SYNC_BRANCH_NAME: ci-upstream-sync-${{ github.run_number }}_${{ github.run_attempt }}
 jobs:
   sync-main:
-    #permissions:
-    #  contents: write
     runs-on: ubuntu-latest
     steps:
       - run: |
           gh auth status
-          #gh repo view rocm/jax
           gh repo sync rocm/jax -b main
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   create-sync-branch:
     needs: sync-main
-    #permissions:
-    #  contents: write
     runs-on: ubuntu-latest
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -38,11 +33,13 @@ jobs:
           git fetch
           git checkout origin/main 
           git checkout -b $SYNC_BRANCH_NAME
+          # Try and merge rocm-main into this new branch so that we don't run upstream's CI code
+          git merge rocm-main || true
+          # If the merge creates conflicts, we want to abort and push to origin anyways so that a dev can resolve the conflicts
+          git merge --abort || true
           git push origin HEAD
   open-sync-pr:
     needs: create-sync-branch
-    #permissions:
-    #  pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - run: |