Episode
Resolving merge conflicts (4 of 5) | Getting started with GitHub
with Leslie Richardson, Robert Green
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
- 00:00 - Introduction
- 01:50 - Making a code change that will conflict with code in remote repository
- 03:05 - Detecting a failed commit due to a code conflict
- 04:05 - Using the Merge Editor to resolve the conflict
- 05:30 - Viewing the branch history, including the conflict and how it was resolved
- 06:20 - Wrap up
Recommended resources
Related episodes
- Using source control (1 of 5)
- Committing code changes (2 of 5)
- Working with branches (3 of 5)
- More on merge conflicts (5 of 5)
Connect
- Visual Studio | Twitter: @VisualStudio
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
- 00:00 - Introduction
- 01:50 - Making a code change that will conflict with code in remote repository
- 03:05 - Detecting a failed commit due to a code conflict
- 04:05 - Using the Merge Editor to resolve the conflict
- 05:30 - Viewing the branch history, including the conflict and how it was resolved
- 06:20 - Wrap up
Recommended resources
Related episodes
- Using source control (1 of 5)
- Committing code changes (2 of 5)
- Working with branches (3 of 5)
- More on merge conflicts (5 of 5)
Connect
- Visual Studio | Twitter: @VisualStudio
Video URL
HTML iframe
GitHub
Visual Studio
Have feedback? Submit an issue here.