Ash Wilson

Hey! First of all: the Atom package doesn't actually place the conflict hunks - it just parses the conflict markers that _git's_ native merge algorithm leaves in each file when...

Huh, that's a cool idea. I didn't even know you could do that. Can you give more details on how this would work, exactly? This is my first thought: -...

> Unfortunately I can't seem to make git diff output '

Nice! That's just what I was hoping for (and hadn't had time to look for). :metal: > I tried using an empty file as ancestor and the output seems to...

: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...

> If I'm not merging and I hit merge-conflicts:next-unresoved, is there any reason it doesn't just run merge-conflicts:detect? :+1: Yeah, that would be a good idea. > And, if I'm...

Weird. That certainly sounds like a parsing bug. Was there a stack trace in the console?

This sounds pretty reasonable to me. One question though: what does this let you do that "Resolve: Ours Then Theirs" and editing the resolved lines doesn't? The only difference that...

> This is useful if the conflict is longer than a few lines on each side. Otherwise it's easy to lose track of where the conflict actually was, and accidentally...

Do you have editor-config installed as well? See #196 for details if you do. Are you on Windows? If so, #227 may be what you're encountering instead.