pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2025-08-14 09:27:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support rebase conflicts in check-merge-conflicts

Browse Source
This commit is contained in:
Anthony Sottile
2017-06-12 10:39:07 -07:00
parent 78818b90cd
commit 6076fd1b15
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'))
)
)