From the course: Git: Branches, Merges, and Remotes
Unlock the full course today
Join today to access over 22,600 courses taught by industry experts or purchase this course individually.
Merge in fetched changes
From the course: Git: Branches, Merges, and Remotes
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…
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.
Contents
-
-
-
-
-
-
-
-
-
(Locked)
Push changes to a remote repository5m 21s
-
(Locked)
Fetch changes from a remote repository5m 1s
-
(Locked)
Merge in fetched changes4m 34s
-
(Locked)
Check out remote branches3m 9s
-
(Locked)
Push to an updated remote branch1m 45s
-
(Locked)
Delete a remote branch4m 26s
-
(Locked)
Enable collaboration3m 53s
-
(Locked)
Collaboration workflow7m 6s
-
(Locked)
-