Modify pre-commit hook to check merge conflicts accidentally committe…

…d not at current merge commit (EleutherAI#1927)
MorishT · Jun 5, 2024 · e39df01 · e39df01
1 parent 7257aa2
commit e39df01
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,6 +10,7 @@ repos:
       - id: check-case-conflict
       - id: check-json
       - id: check-merge-conflict
+        args: [--assume-in-merge]
       - id: check-symlinks
       - id: check-yaml
         args: ["--unsafe"]