mirror of
https://github.com/astral-sh/ruff.git
synced 2025-08-04 10:48:32 +00:00
Add pre-commit hook to check for merge conflicts (#17279)
This commit is contained in:
parent
10e44124e6
commit
06ffeb2e09
1 changed files with 5 additions and 0 deletions
|
@ -18,6 +18,11 @@ exclude: |
|
|||
)$
|
||||
|
||||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v5.0.0
|
||||
hooks:
|
||||
- id: check-merge-conflict
|
||||
|
||||
- repo: https://github.com/abravalheri/validate-pyproject
|
||||
rev: v0.24.1
|
||||
hooks:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue