New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check_merge_conflict.py does not work in worktrees #638

Closed

daschuer opened this issue Aug 7, 2021 · 0 comments · Fixed by #662

Labels

daschuer commented 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

asottile added the enhancement label

errsyn mentioned this issue

Adjust git dir when checking for merge in worktree #662

Merged

asottile closed this as completed in #662

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment