How to fix merge conflicts using GitHub's Atom text editorblog.ruigomes.me1 point·ruigomes··0 commentsOpen articleSaveView on HN