Ash Wilson
Ash Wilson
@marcioc0sta, can you double check your merge-conflicts version? In 1.3.7, the top line in your stack trace is [a comment](https://github.com/smashwilson/merge-conflicts/blob/v1.3.7/lib/view/covering-view.coffee#L38). If you aren't on 1.3.7 yet, an upgrade and (possibly)...
:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...
Hmm, it isn't doing this for me:  What themes were you using? The version of Atom may effect this as well, if...
Is git aware that the file has conflicts, or is there a chance it was erroneously marked as resolved? Try running `git status` (and `git status --porcelain`) at the command-line...
Interesting. Thanks for doing the detective work to narrow it down! I wonder what the conflict is? I'll watch the other issue to see if it's something that needs to...
My first thought is that some of the normalization that it's doing is interfering with the [regexp we're using to match conflict areas](https://github.com/smashwilson/merge-conflicts/blob/master/lib/conflict.coffee#L8), but we _are_ already handling `\r\n`... hmm.
> After hard closing atom, and reopening (with editorconfig disabled) it does work as expected. However, even with editorconfig enabled, I can do what you see in the gif to...
> Reporting of same issue here. I don't have editorconfig package with me. So the culprit may be something else. I tried to disabling all of my community package but...
Uncaught Error: Failed to rename lockfile to '/Users/hernanezequielmartinez/Documents/workspace/l...
:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...
:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being [deprecated](https://github.com/smashwilson/merge-conflicts/blob/master/docs/announcement.md), so I won't be getting to this one here. This one should be...