diff --git a/.github/workflows/cpp_check.yml b/.github/workflows/cpp_check.yml index 420bf155..78840579 100644 --- a/.github/workflows/cpp_check.yml +++ b/.github/workflows/cpp_check.yml @@ -26,7 +26,7 @@ jobs: git fetch origin git checkout cpp_check git pull - git merge origin/main + git merge origin/main --force git push origin cpp_check - name: cppcheck