Explore the difference between a fast-forward merge and a true merge.
- [Instructor] We need to understand the difference … between fast forward merges and real merges. … In the previous movie we learned how to do a merge, … and I gave you an example of how a merge works … by showing you a diagram like this. … And we talked about how you would make a merge commit … that would merge revise_navigation back into master, … except that that's not what our master branch … really looked like when we actually … went to the command line and tried it out. … Instead, it looked something more like this, … we had not made additional commits on master, … we had only made a new commit in our feature branch. … So before we made our merge, … the head pointer was pointing at the … tip of the master branch. … And then when we went to merge in the feature branch … what it did was it looked at that feature branch … and saw that if it followed the history back … that in the process of traveling backwards … that it ran into that head commit, 534de. … So it realized that this was just an extension of master, …
- 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.