Update sync-notebooks.yml

.github/workflows/sync-notebooks.yml

@@ -13,14 +13,28 @@ jobs:
       uses: actions/checkout@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
+        fetch-depth: 0  # Fetch all history for all branches and tags
+
     - name: Install rsync
       run: sudo apt-get install rsync
+
     - name: Rsync notebooks
       run: |
         git clone https://github.com/LorenFrankLab/spyglass.git tmp --depth=1
         rsync -av --exclude='.git/' tmp/notebooks/ ./notebooks/
+
+    - name: Configure git
+      run: |
         git config user.name "GitHub Actions"
         git config user.email "[email protected]"
+
+    - name: Commit changes
+      run: |
         git add notebooks/
-        git commit -m "Sync notebooks" || echo "No changes to commit"
-        git push origin HEAD:main
+        git diff --staged --quiet || git commit -m "Sync notebooks"
+
+    - name: Pull with rebase
+      run: git pull --rebase
+
+    - name: Push changes
+      run: git push origin HEAD:master