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.

Good start! Now let's look deeper at a merge conflict! 🔍 This can be intimidating, but have no fear, Git is smart when it comes to merging! Git only needs a human to decide how to resolve the ...

Congratulations friend, you've completed this course! Here's a recap of all the tasks you've accomplished in your repository: You learned why merge conflicts happen. You resolved a simple merge ...