How to fix merge conflicts using GitHub's Atom text editor(blog.ruigomes.me)1 points by ruigomes 11 years ago | 0 commentsNo comments yet