Learn how to resolve Merge Conflicts in Git using this guide. Merge Conflicts can occur if the same parts of code are changed in different branches.

Sublime HQ – the folks behind the excellent text editor Sublime Text – has released a code editor for developers that focuses on a clean interface for coding and solving git merges. It’s ...