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.

View merge conflicts

View merge conflicts - Visual Studio Tutorial

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

Start my 1-month free trial

View merge conflicts

“

- [Instructor] Terry and I are both working on the same file, this Colors.txt file. She's made a change on line two, and renamed it to light-blue, and then she has committed, and then pushed to the remote. I'm working on the same file, and I've made a change to the same line, and I've committed to local. Now the steps I'm supposed to follow is commit to local, pull from remote, fix any conflicts if necessary, and push. I would go over to the Sync section, and I will do a fetch. And when I get a fetch, it tells me that I have one incoming commit where Terry changed the color to light-blue. And I have my outgoing commit where I changed the color to dark-blue. So the fetch tells me there's some potential conflicts. Now if I do a pull or a sync, it'll attempt to pull the information over from the remote. And when it does, I get more information. Pull completed with conflicts in the WorkingWithGit repository, and then…

Contents