How to fix merge conflicts using GitHub's Atom text editorhttp://blog.ruigomes.me/leveraging-atoms-merge-conflict-package/ by ruigomes • 12 years ago 1 0 12 years agoBLblog.ruigomes.me