Skip to content

Commit

Permalink
Merge pull request #42 from alexv-smirnov/cmm
Browse files Browse the repository at this point in the history
Conflicts on CMakeLists
  • Loading branch information
alexv-smirnov authored Dec 5, 2024
2 parents 8d2c0d5 + dd6433a commit bfe2797
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/sync_cmakebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bfe2797

Please sign in to comment.