Skip to content

check_merge_conflict.py does not work in worktrees  #638

Description

@daschuer

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

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions