From 6ae6d6b50b294d9cafa0f773dad6f66432e45df2 Mon Sep 17 00:00:00 2001
From: Aaron Gokaslan <aaronGokaslan@gmail.com>
Date: Mon, 7 Apr 2025 11:08:06 -0400
Subject: [PATCH] Add pre-commit hook to check for merge conflicts

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

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