How to Deal with Merge Conflicts in Git | Hacker News Reader