https://github.com/python/cpython/commit/452b0e5142cd27fc76ff3f073d937cdeaf878a3c commit: 452b0e5142cd27fc76ff3f073d937cdeaf878a3c branch: 3.11 author: Miss Islington (bot) <[email protected]> committer: AlexWaygood <[email protected]> date: 2024-03-26T14:11:30Z summary:
[3.11] pre-commit: add `check-case-conflict` and `check-merge-conflict` (GH-117259) (#117261) Co-authored-by: Hugo van Kemenade <[email protected]> files: M .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ad9593cc38a74f..04a0d1fe65e4d4 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/ @@ -10,6 +10,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 _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
