smashwilson / merge-conflicts

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

Include a how-to guide in the README #178

Closed smashwilson closed 8 years ago

smashwilson commented 8 years ago

The README didn't actually tell you... how to use it! That seems like important information. I'm adding a quick walkthrough, with screenshots.