smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Stage with git-utils #191

Closed smashwilson closed 8 years ago

smashwilson commented 8 years ago

This might address #171. At least, this way we shouldn't collide with whatever is locking the git repo within Atom.