Sublime Git is a clean code editor for merge conflicts

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 called Sublime Git, and it’s available for free on macOS, Windows, and Linux. Sublime Git includes powerful features like an integrated git merge tool, the ability to search for specific commits, command line integration, code and file history, and syntax highlighting. It also lets you c