Merge conflict management has emerged as a critical element in modern software development, where collaborative coding demands the integration of numerous, concurrently developed code contributions.

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

Clear this box to restore the merge-conflict dialog. Recently I told you how to take advantage of Windows 8’s cool new file-copy feature. What I didn’t mention was a small, but potentially significant ...