In this video, pull down remote commits and merge them into a local branch.
- [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. …
- Finding and viewing commits
- Creating and switching branches
- Comparing branches
- Resetting branches
- Merging branches
- Stashing uncommitted changes
- Setting up a remote repository
- Creating remote branches
- Fetching and pushing changes to a remote
- Enabling remote collaboration
Skill Level Beginner
1. Navigate the Commit Tree
3. Reset Branches
4. Merge Branches
5. Stash Changes
6. Set Up a Remote
7. Collaborate with a Remote
Next steps3m 40s
- Mark as unwatched
- Mark all as unwatched
Are you sure you want to mark all the videos in this course as unwatched?
This will not affect your course history, your reports, or your certificates of completion for this course.Cancel
Take notes with your new membership!
Type in the entry box, then click Enter to save your note.
1:30Press on any video thumbnail to jump immediately to the timecode shown.
Notes are saved with you account but can also be exported as plain text, MS Word, PDF, Google Doc, or Evernote.