From 06ffeb2e09e8a5440fc9bc07d2f49295ad809497 Mon Sep 17 00:00:00 2001
From: Aaron Gokaslan <aaronGokaslan@gmail.com>
Date: Thu, 10 Apr 2025 03:22:54 -0700
Subject: [PATCH] Add pre-commit hook to check for merge conflicts (#17279)

---
 .pre-commit-config.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ece19e9022..063b2b248c 100644
--- 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: