From the course: Visual Studio Tools for Azure DevOps

Unlock the full course today

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

Sync changes with a remote repository

Sync changes with a remote repository

From the course: Visual Studio Tools for Azure DevOps

Start my 1-month free trial

Sync changes with a remote repository

“

- [Instructor] In the incoming section I've got two choices, fetch and pull. These are both get commands. Fetch brings in the changes from the remote repo without merging them into my files. So this means I can compare what's on the server with what's on my local repo. Pull brings in the changes and does merge them. And then push is for my code that's in the local repo that I want to push to the remote. Let's start by clicking on fetch. So I see that there is some code here from Terry about an hour ago. And she's added some HTML, some screenshot files. And let's go ahead and pull those changes in. And it says, "I can't do that. "There's some conflicts in the file in the repository." So I need to resolve those conflicts. And here is the problem. It's this read-me file. I've edited this read-me file and Terry's edited the read-me file. So I'll double-click on this. I'll do a diff. I decide that I want to keep this local file. And now you see I've got my own copy. There's my copy and…

Contents