language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-28 12:55:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add pre-commit hook to check for merge conflicts (#17279)

Browse source
This commit is contained in:
Aaron Gokaslan 2025-04-10 03:22:54 -07:00 • committed by GitHub
parent 10e44124e6
commit 06ffeb2e09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.pre-commit-config.yaml
View file

@ -18,6 +18,11 @@ exclude: |
)$ )$
repos: 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 - repo: https://github.com/abravalheri/validate-pyproject
rev: v0.24.1 rev: v0.24.1
hooks: hooks: