Merge pull request #38 from alexv-smirnov/cmm

Conflicts on CMakeLists
alexv-smirnov · Dec 5, 2024 · 5f53098 · 5f53098
2 parents a8314e1 + 2ef7ccb
commit 5f53098
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/sync_cmakebuild.yml b/.github/workflows/sync_cmakebuild.yml
@@ -37,9 +37,9 @@ jobs:
         
         conflicts_file=$(mktemp)
         git merge main --no-commit --no-ff main | true > $conflicts_file
-        git reset HEAD --hard
-        git clean -fd
-        if [ -s $conflicts_file ];then
+        git reset HEAD --hard > /dev/null
+        git clean -fd > /dev/null
+        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
           git add .