different way to merge

.github/workflows/sync_upstream.yml

@@ -13,24 +13,23 @@ jobs:
     name: Sync latest commits from upstream repo
     if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     steps:
-      - uses: tgymnich/[email protected]
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: 202405-broadcom
-          head: 202405
-          merge_method: rebase
-
-# Now we need to update the hashes used for sonic-swss and sonic-sairedis
       - name: Checkout sonic-build
         uses: actions/checkout@v4
         with:
           submodules: "recursive"
           fetch-depth: 0
-      - name: Update hashes
+      - name: Update
         run: |
           git config --global user.name '[github actions]'
           git config --global user.email '[email protected]'
           git pull
+          git remote add upstream https://github.com/sonic-net/sonic-buildimage.git
+          git fetch upstream
+          if ! git rebase upstream/202405 ; then
+            while ! git rebase --skip ; do
+              echo "Skipped Commit"
+            done
+          fi
           cd src/sonic-swss
           git checkout 202405-broadcom
           git pull
@@ -43,5 +42,5 @@ jobs:
             echo "nothing to commit"
           else
             git commit -am "update sonic-swss and sonic-sairedis branches"
-            git push
           fi
+          git push --force