atom-parinfer icon indicating copy to clipboard operation
atom-parinfer copied to clipboard
verified publisher icon oakmac

Smarter git merge conflict behavior

Open oakmac opened this issue 7 years ago • 0 comments

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 avatar Aug 29 '18 12:08 oakmac