Modify pre-commit hook to check merge conflicts accidentally committed not at...

Modify pre-commit hook to check merge conflicts accidentally committed not at current merge commit (#1927)

Modify pre-commit hook to check merge conflicts accidentally committed not at...
Modify pre-commit hook to check merge conflicts accidentally committed not at current merge commit (#1927)
e39df01c · LSinev · GitHub · 7257aa2e · e39df01c
Unverified Commit e39df01c authored Jun 05, 2024 by LSinev Committed by GitHub Jun 05, 2024
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.pre-commit-config.yaml .pre-commit-config.yaml +1 -0

No files found.
--- 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"]