Episode
More on merge conflicts (5 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 shows another example of how to resolve conflicts that occur if someone has changed the same code you are committing.
Chapters
- 00:00 - Introduction
- 00:55 - Creating a new branch
- 02:35 - Creating a pull request that will fail due to a conflict
- 04:10 - Pulling the main branch from the remote repository
- 04:55 - Attempting to merge branches to see what the conflict is
- 05:35 - Using the Merge Editor to resolve the conflict
- 06:55 - Merging the pull request
- 07:45 - Wrap up
Recommended resources
Related episodes
- Using source control (1 of 5)
- Committing code changes (2 of 5)
- Working with branches (3 of 5)
- Resolving merge conflicts (4 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 shows another example of how to resolve conflicts that occur if someone has changed the same code you are committing.
Chapters
- 00:00 - Introduction
- 00:55 - Creating a new branch
- 02:35 - Creating a pull request that will fail due to a conflict
- 04:10 - Pulling the main branch from the remote repository
- 04:55 - Attempting to merge branches to see what the conflict is
- 05:35 - Using the Merge Editor to resolve the conflict
- 06:55 - Merging the pull request
- 07:45 - Wrap up
Recommended resources
Related episodes
- Using source control (1 of 5)
- Committing code changes (2 of 5)
- Working with branches (3 of 5)
- Resolving merge conflicts (4 of 5)
Connect
- Visual Studio | Twitter: @VisualStudio
Video URL
HTML iframe
GitHub
Visual Studio
Have feedback? Submit an issue here.