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

Kaleidoscope, the popular file comparison and merge tool, recently released an update with significant improvements to its merge conflict resolution tools. The new version introduces new features and ...

In last month's update, the team announced he new ability for devs to use command-line options to bring up the merge editor in the code editor, enabling them, for example, to set some configurations ...