GitHub today announced a major update to its visual Git client, GitHub Desktop. Version 1.5 introduces a new way to resolve merge conflicts, which are inevitable when working on a project with a team. Previous versions of GitHub Desktop merely warned if a conflict would occur, leaving resolution entirely in the hands of the developer. 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. Here’s a GIF showing how it works in practice. GitHub launched GitHub Desktop in 2017, which…

This story continues at The Next Web

Or just read more coverage about: GitHub