From the course: Source Code Control in .NET with Git Using SourceTree
Join today to access over 22,600 courses taught by industry experts or purchase this course individually.
Resolve conflict
From the course: Source Code Control in .NET with Git Using SourceTree
Resolve conflict
- [Instructor] So User 1's feeling a little worried at this point. We've got this merge conflict. How are we going to resolve it? And also, it's telling us that it's got 1 to pull and 1 to push, and we're 1 ahead, and we're 1 behind. It turns out that SourceTree makes this pretty easy to fix. We come down to the file in question, which we can tell from this warning sign. Right click, and go to Resolve Conflicts. Now we've got a couple easy ways to resolve it. We can say, I just want my changes and wipe out the other person's changes. Or we can say, wipe out my changes and use theirs. We don't want either of those. We want to integrate these files. As a safety measure, by the way, any time you're in the middle of a merge and something goes wrong, just click Restart Merge. Okay, we're ready to do our merge. Let's launch our external merge tool, and you'll remember from Options, that that's KDiff3. So we'll go ahead and launch that. And it's going to show us that there are conflicts…
Practice while you learn with exercise files
Download the files the instructor uses to teach the course. Follow along and learn by watching, listening and practicing.
Download courses and learn on the go
Watch courses on your mobile device without an internet connection. Download courses using your iOS or Android LinkedIn Learning app.