From 5b5c5d09ddba06248a35b2df7fa5b815aafb9b92 Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Thu, 5 Oct 2023 19:34:07 -0700
Subject: [PATCH] python,misc: Add `check-merge-conflict` hook to pre-commit

This hook will check to see if files have merge conflict strings and
blocks commit if so.

Change-Id: I8687e0a8367d3c43133890001023e0352954d90d
---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c7faabcc60..4435b881dc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -64,6 +64,7 @@ repos:
             args: [--fix=lf]
           - id: check-ast
           - id: check-case-conflict
+          - id: check-merge-conflict
           - id: requirements-txt-fixer
     - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
       rev: 0.2.3