Skip to content
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

Smarter git merge conflict behavior #104

Open
oakmac opened this issue Aug 29, 2018 · 0 comments
Open

Smarter git merge conflict behavior #104

oakmac opened this issue Aug 29, 2018 · 0 comments
Assignees
@oakmac
Labels
enhancement

Comments

@oakmac
Copy link
Owner

oakmac commented Aug 29, 2018

If the user opens a file that contains markers indicating a git merge conflict (ie: <<<<<<< HEAD, =======, etc) we should not start Parinfer automatically.

I think the best idea is to just disable Parinfer until the conflict is fixed. Maybe show the user a message as well?
@oakmac oakmac self-assigned this Aug 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@oakmac oakmac

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@oakmac