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 ...

With GitHub Desktop 1.5, the app will list the files with conflicts, open your preferred editor to fix them, and let you know when everything is ready to merge.