How to fix merge conflicts using GitHub's Atom text editor #1 Post by ruigomes » Tue, Jun 03, 2014, 5:30 PM UTC How to fix merge conflicts using GitHub's Atom text editorblog.ruigomes.me