derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python,misc: Add check-merge-conflict hook to pre-commit

Browse Source 
This hook will check to see if files have merge conflict strings and
blocks commit if so.

Change-Id: I8687e0a8367d3c43133890001023e0352954d90d
This commit is contained in:
Bobby R. Bruce
2023-10-05 19:34:07 -07:00
parent 132ec10818
commit 5b5c5d09dd
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.pre-commit-config.yaml
View File

@@ -64,6 +64,7 @@ repos:
args: [--fix=lf] args: [--fix=lf]
- id: check-ast - id: check-ast
- id: check-case-conflict - id: check-case-conflict
- id: check-merge-conflict
- id: requirements-txt-fixer - id: requirements-txt-fixer
- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
rev: 0.2.3 rev: 0.2.3