From the course: Visual Studio: Source Control with Git and GitHub

Unlock the full course today

Join today to access over 22,600 courses taught by industry experts or purchase this course individually.

Handle merge conflicts

Handle merge conflicts - Visual Studio Tutorial

From the course: Visual Studio: Source Control with Git and GitHub

Start my 1-month free trial

Handle merge conflicts

“

- [Instructor] Let's look at some of the conflict resolution tools. As I'll go back to the Sync area. Pull, which will trigger the Merge conflict. And then I'll click here on Conflicts. On my example, we're looking at here, there's only one file that has a conflict but if in a real-world situation you have several files that have conflicts, they would all show here. I want to look at the changes or the conflicts in this file, so I click on it. And I've got multiple choices here, we'll start by looking at these Diff links. I click on this link and it shows the original value and what I've changed on Local. If I click on this link next to the Remote, it shows the original value and what's on the Remote. And then of course, I could choose to Keep the Local or Take the Remote. I can also choose to compare the files, and now I see the Remote version over here, what Terri changed, and I can see the local version here. Now…

Contents