From the course: Git: Branches, Merges, and Remotes

Unlock the full course today

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

Merge in fetched changes

Merge in fetched changes

From the course: Git: Branches, Merges, and Remotes

Start my 1-month free trial

Merge in fetched changes

- [Narrator] Once a collaborator has fetched the changes from a remote repository, then their local tracking directory will contain those changes. And their repository will know about them and they can work with them. But those changes are not merged into their working branch. They're just in the tracking branch. If they want to have them in the actual branch, they'll need to merge them in. Remote tracking branches are the same as other branches. You just can't check them out. We can merge with it like any other branch. So here's an example where we have my computer, and you can see that the master branch is still pointing at the commit f36de. But the remote repository and origin master have advanced. More commits have been added to it, and my local computer knows about them. I've already done a fetch. That's how I'm able to have those last two additional commits on the right. What we need to do now is merge master with origin master. Just like you would any other branch. And you can…

Contents