Ash Wilson

I just published version 1.2.4, which: 1. Uses the new Decorations API instead of fussing around with `.line` elements by hand, which should be a big performance gain. 2. Only...

> I'm getting ready to have to merge a large feature i've been working on into our dev branch so i am expecting a large scale test of your new...

Okay, I'm definitely seeing this now, myself. As soon as I activate merge-conflicts one of the Atom Helper processes spikes up to ~15-20% CPU usage and stays there. I did...

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

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

Oh hey, I didn't know about `Project::repositoryForDirectory`. I've also been keeping an eye on atom/atom#9213, which would let me :hocho: `GitBridge` entirely in favor of using the bundled, asynchronous nodegit...

@emileber: Try opening an editor for any file in the project folder with conflicts, then running `merge-conflicts:detect-conflicts` :wink:

Oh, interesting. Would you mind opening that as a separate issue? I'd rather keep this one around for the ".git directory doesn't align with project root" cases.

Nuts. I hadn't seen this one for a long time, so I was speculating that it had been fixed upstream, but I suppose not! The original issue was #96, but...

I have a _potential_ fix that'll be included in the next release (1.3.7). Once that's out, I'd appreciate it if those of you who can reproduce reliably can let me...