feat: update check git conflict

pass-with-high-score · Sep 4, 2024 · dfed335 · dfed335
1 parent bdec5aa
commit dfed335
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/check_git_conflict.yml b/.github/workflows/check_git_conflict.yml
@@ -25,7 +25,7 @@ jobs:
         run: |
           git fetch origin main
           MERGE_BASE=$(git merge-base HEAD origin/main)
-          git merge-tree --check $MERGE_BASE HEAD origin/main
+          git merge-tree $MERGE_BASE HEAD origin/main
           if [[ $? -ne 0 ]]; then
             echo "Code conflicts detected. Please resolve them before merging."
             exit 1