Merge pull request #35 from alexv-smirnov/cmm

Conflicts on CMakeLists

.github/workflows/sync_cmakebuild.yml

@@ -34,6 +34,17 @@ jobs:
         mainsha=$(git rev-parse HEAD)
         git checkout cmakebuild
         prevsha=$(git rev-parse HEAD)
+        
+        conflicts_file=$(mktemp)
+        git merge main --no-commit --no-ff main | true > $conflicts_file
+        git reset HEAD --hard
+        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 .
+          git commit -m "Remove conflicted CMakeLists"
+        fi
+        
         git merge main --no-edit
         currsha=$(git rev-parse HEAD)
         if [ ${prevsha} == ${currsha} ];then