Skip to content

check_merge_conflict.py does not work in worktrees  #638

New issue
New issue
Closed
#662
Closed
check_merge_conflict.py does not work in worktrees #638
#662
Labels
enhancement
@daschuer

Description

@daschuer
daschuer
opened on Aug 7, 2021

pre-commit-hooks/pre_commit_hooks/check_merge_conflict.py

Line 17 in 8c1183c

os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
.git is a file, not a folder in worktrees

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancement

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions