Resolving merge conflicts (4 of 5) | Getting started with GitHub

Welcome to the Getting started with GitHub series, where you will learn how to share your code from within Visual Studio by using Git and GitHub. In this episode, Robert Green shows how to resolve conflicts that occur if someone has changed the same code you are committing.

Chapters
0:00 - Introduction
1:45 - Making a code change that will conflict with code in remote repository
3:05 - Detecting a failed commit due to a code conflict
4:05 - Using the Merge Editor to resolve the conflict
5:30 - Viewing the branch history, including the conflict and how it was resolved
6:25 - Wrap up

Recommended resources
Visual Studio version control docs: https://learn.microsoft.com/en-us/vis...
Demo script used in this series: https://github.com/rogreen/GettingSta...

Episodes in this series
Using source control: Using source control (1 of 5) | Getti...
Committing code changes: Committing code changes (2 of 5) | Ge...
Working with branches: Working with branches (3 of 5) | Gett...
Resolving merge conflicts: Resolving merge conflicts (4 of 5) | ...
More on merge conflicts: More on merge conflicts (5 of 5) | Ge...