From 7a5ee7215a9763f5c0465954d863a7f0d472fb7d Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@gmail.com>
Date: Mon, 21 Aug 2023 04:03:54 +1000
Subject: [PATCH] pre-commit: add hook `check-merge-conflict`

Check for files that contain merge conflict strings.

https://github.com/pre-commit/pre-commit-hooks#check-merge-conflict

Another check or test we can have that can run automatically locally with `git commit`.
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f7c3c0f90e17..d41673fb742a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
       #- id: check-added-large-files
       - id: check-case-conflict
       #- id: check-executables-have-shebangs
-      #- id: check-merge-conflict
+      - id: check-merge-conflict
       - id: check-vcs-permalinks
       #- id: check-yaml
       - id: detect-private-key