10000 [3.11] pre-commit: add `check-case-conflict` and `check-merge-conflic… · python/cpython@452b0e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 452b0e5

Browse files
miss-islingtonhugovk
miss-islington
and
hugovk
authored
[3.11] pre-commit: add check-case-conflict and check-merge-conflict (GH-117259) (#117261)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent 2d93236 commit 452b0e5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

‎.pre-commit-config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.2.0
3+
rev: v0.3.4
44
hooks:
55
- id: ruff
66
name: Run Ruff on Lib/test/
@@ -10,6 +10,8 @@ repos:
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
1111
rev: v4.5.0
1212
hooks:
13+
- id: check-case-conflict
14+
- id: check-merge-conflict
1315
- id: check-toml
1416
exclude: ^Lib/test/test_tomllib/
1517
- id: check-yaml

0 commit comments

Comments
 (0)
0