In this part of my Git video tutorial I cover Branching, HEAD, Checkout, Rebasing, Reverting, Reset, Clean, and Mergetool. I also spend some time explaining what happens when you commit and how to solve merge conflicts.
Other Git Video Tutorials
Init, Add, Commit, Status, Diff, Rm, Log and Installation :
GitHub, Remote Repositories, Push, Pull, Remote, Fetch, Tagging, Aliases and Clone :
Branching, HEAD, Checkout, Rebasing, Reverting, Reset, Clean, Solving Merge Conflicts and Mergetool :
Generating SSH keys, how to set up multiple GitHub accounts on one computer and the Fork & Pull workflow :