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

Merge pull request #199 from pre-commit/rebase_conflict

Browse source 
Support rebase conflicts in check-merge-conflicts
This commit is contained in:
Anthony Sottile 2017-07-02 19:43:55 -07:00 • committed by GitHub
commit aa50988889
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pre_commit_hooks/check_merge_conflict.py
View file

@ -15,7 +15,11 @@ WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'
def is_in_merge():
return (
os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
os.path.exists(os.path.join('.git', 'MERGE_HEAD'))
(
os.path.exists(os.path.join('.git', 'MERGE_HEAD')) or
os.path.exists(os.path.join('.git', 'rebase-apply')) or
os.path.exists(os.path.join('.git', 'rebase-merge'))
)
)