Fix workshop

kernelkit · Jan 28, 2025 · 99c6b75 · 99c6b75
1 parent 27d2e2d
commit 99c6b75
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/sync-infix.yml b/.github/workflows/sync-infix.yml
@@ -28,6 +28,11 @@ jobs:
           if git ls-remote --heads origin latest | grep -q latest; then
             echo "Latest exists, checking out"
             git checkout latest
+            if [[ -n "$(git diff --exit-code origin/main)" ]]; then
+              echo "New commits exist on main"
+              git merge origin/main
+              CHANGES=1
+            endif
             git submodule update --init --recursive
           else
             echo "Latest does not exist, create it"