Add pre-commit hook to check for merge conflicts (#17279)

2025-04-10 03:22:54 -07:00
parent 10e44124e6
commit 06ffeb2e09
1 changed files with 5 additions and 0 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,6 +18,11 @@ exclude: |
  )$

 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-merge-conflict
+
  - repo: https://github.com/abravalheri/validate-pyproject
    rev: v0.24.1
    hooks: