pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-05 03:26:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add check-merge-conflict hook

Browse source
This commit is contained in:
Guy Kisel 2015-03-13 16:30:14 -07:00
parent 70a319aea3
commit 779a42919a
5 changed files with 66 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -28,6 +28,7 @@ Add this to your `.pre-commit-config.yaml`
- `check-case-conflict` - Check for files that would conflict in case-insensitive filesystems.
- `check-docstring-first` - Checks a common error of defining a docstring after code.
- `check-json` - Attempts to load all json files to verify syntax.
- `check-merge-conflict` - Check for files that contain merge conflict strings.
- `check-xml` - Attempts to load all xml files to verify syntax.
- `check-yaml` - Attempts to load all yaml files to verify syntax.
- `debug-statements` - Check for pdb / ipdb / pudb statements in code.