Merge pull request #36 from alexv-smirnov/cmm

Conflicts on CMakeLists
alexv-smirnov · Dec 5, 2024 · 76aa6b3 · 76aa6b3
2 parents 3e2d541 + f8805f1
commit 76aa6b3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/sync_cmakebuild.yml b/.github/workflows/sync_cmakebuild.yml
@@ -37,7 +37,7 @@ jobs:
         
         conflicts_file=$(mktemp)
         git merge main --no-commit --no-ff main | true > $conflicts_file
-        git reset HEAD --hard
+        git merge --abort
         if [ -s $conflicts_file ];then
           echo Conflicts detected, trying to remove referenced CMakeLists* files
           grep -E -o '\s\S*CMakeLists\S*\s' $conflicts_file | xargs rm