Ash Wilson

Ah, submodules are an area that I haven't even tried to address yet. That's kind of a weird failure case, though - I'm a little surprised it finds conflicts inside...

: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 issue still applies...

:+1: Hell yes. I'll likely wait on rgbkrk/atom-achievements#5 to implement the merging-X-hunks ones, though.

- _Selfish_: Accept only your side for an entire merge. - _Low Self Confidence_: Accept only their side for an entire merge. - _Voltron_: Resolve a conflict as "both". -...

I bet @atiaxi could come up with some great ones here. Terrible puns are right up his alley.

There's already been a script created for this in #195, but it isn't exposed in any obvious way yet.

Hmm, good point. One approach may be to "float" the controls in if the editor view is horizontally scrollable. Another would be to not right-justify them at all, but keep...

Isn't the caption already "Use Me"? They are `` elements with the `btn-` classes applied to them - I think it's hard to tell what they are because I have...

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.

> This error occurs to me when i open a file listed on the conflicts list on the bottom of atom. Have you tried with 1.3.7? I thought I resolved...