Hacker News new | ask | show | jobs
How to fix merge conflicts using GitHub's Atom text editor (blog.ruigomes.me)
1 points by ruigomes 4392 days ago