Changed anti ping pong to use commit msg, added --rebase to git pull, moved after commit to narrow race win

Author: adamlui

.github/workflows/sync-changes-to-repos.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    if: (github.repository == 'KudoAI/googlegpt') && (github.event.commits[0].committer.username != 'kudo-sync-bot')
+    if: (github.repository == 'KudoAI/googlegpt') && !contains(github.event.head_commit.message, '[auto-sync]')
     runs-on: ubuntu-24.04
     permissions:
       contents: read
@@ -109,20 +109,21 @@ jobs:
         if: env.SYNC_SRC
         run: |
           cd ${{ github.workspace }}/KudoAI/googlegpt
-          git add .
-          git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from $SYNC_SRC/]" || true
+          git add . && git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from $SYNC_SRC/]" || true
+          git pull --rebase
           git push
 
       - name: Push changes to adamlui/ai-web-extensions
         run: |
           cd ${{ github.workspace }}/adamlui/ai-web-extensions
-          git add .
-          git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/googlegpt]" || true
+          git add . && git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/googlegpt]" || true
+          git pull --rebase
           git push
 
+
       - name: Push changes to adamlui/userscripts
         run: |
           cd ${{ github.workspace }}/adamlui/userscripts
-          git add .
-          git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/googlegpt]" || true
+          git add . && git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/googlegpt]" || true
+          git pull --rebase
           git push