Conflicts on CMakeLists

alexv-smirnov · Dec 5, 2024 · dd6433a · dd6433a
1 parent 2276c9e
commit dd6433a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/sync_cmakebuild.yml b/.github/workflows/sync_cmakebuild.yml
@@ -36,7 +36,7 @@ jobs:
         prevsha=$(git rev-parse HEAD)
         
         conflicts_file=$(mktemp)
-        for i in $(seq 1 10)
+        for i in $(seq 1 10);do
           (git merge main --no-commit --no-ff main > $conflicts_file) | true
           git reset HEAD --hard > /dev/null
           git clean -fd > /dev/null