From 2de78deff197c0b0b082371b2dbbb068de1ac161 Mon Sep 17 00:00:00 2001
From: Rambaud Pierrick <12rambau@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:05:02 +0200
Subject: [PATCH] fix: add a conflict marker hook

---
 package/.pre-commit-config.yaml.jinja | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/.pre-commit-config.yaml.jinja b/package/.pre-commit-config.yaml.jinja
index 574a2bd..62b8409 100644
--- a/package/.pre-commit-config.yaml.jinja
+++ b/package/.pre-commit-config.yaml.jinja
@@ -51,3 +51,12 @@ repos:
         stages: [commit]
         additional_dependencies:
         - tomli
+
+  # Prevent committing inline conflict markers
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-merge-conflict
+        stages: [commit]
+        args: [--assume-in-merge]
+