fix: add a conflict marker hook

12rambau · Oct 6, 2023 · 2de78de · 2de78de
1 parent 186a12a
commit 2de78de
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/package/.pre-commit-config.yaml.jinja b/package/.pre-commit-config.yaml.jinja
@@ -51,3 +51,12 @@ repos:
         stages: [commit]
         additional_dependencies:
         - tomli
+
+  # Prevent committing inline conflict markers
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-merge-conflict
+        stages: [commit]
+        args: [--assume-in-merge]
+