From 2278a4f048d70b58dc611055bdae8ac2e4594c72 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Sun, 15 Mar 2026 21:57:31 +0000
Subject: [PATCH] feat: add and update pre-commit (#4770)

Reviewed-on: https://gitea.alexlebens.dev/alexlebens/infrastructure/pulls/4770
---
 .pre-commit-config.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 436e43785..febe2533c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -9,7 +9,9 @@ repos:
         exclude: '^.*\/templates\/.*$'
         args:
           - --multi
+      - id: check-merge-conflict
+      - id: check-json
   - repo: https://github.com/IamTheFij/docker-pre-commit
-    rev: v2.0.0
+    rev: v3.0.1
     hooks:
       - id: docker-compose-check