From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:12:36 +0000 (+0100)
Subject: [3.12] pre-commit: add `check-case-conflict` and `check-merge-conflict` (GH-117259... 
X-Git-Tag: v3.12.3~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b95ba0306b4a748de38c728a1406fa0df20eea9;p=thirdparty%2FPython%2Fcpython.git

[3.12] pre-commit: add `check-case-conflict` and `check-merge-conflict` (GH-117259) (#117260)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 69d852389851..663a11897d98 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+    rev: v0.3.4
     hooks:
       - id: ruff
         name: Run Ruff on Lib/test/
@@ -14,6 +14,8 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
+      - id: check-case-conflict
+      - id: check-merge-conflict
       - id: check-toml
         exclude: ^Lib/test/test_tomllib/
       - id: check-yaml