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.
If you haven’t watched parts 1 and 2 of this tutorial you definitely should watch them first so that this isn’t confusing. I also provide a cheat sheet / transcript below after the video to aid in translation.
If you enjoy videos like this, it would help my Google search ranking if you shared with a click here [googleplusone]
Other Git Video Tutorial Videos
Init, Add, Commit, Status, Diff, Rm, Log and Installation : http://goo.gl/L3bR9f
GitHub, Remote Repositories, Push, Pull, Remote, Fetch, Tagging, Aliases and Clone : http://goo.gl/ctIF44
Branching, HEAD, Checkout, Rebasing, Reverting, Reset, Clean, Solving Merge Conflicts and Mergetool : http://goo.gl/zWDj7T
Generating SSH keys, how to set up multiple GitHub accounts on one computer and the Fork & Pull workflow : http://goo.gl/jQo7rv
Git Video Tutorial Cheat Sheet / Transcript
hello
thank you for this great tutorial
could you please tell us some good available merge tools for windows
thank you again
You’re very welcome 🙂 KDiff is very useful for Windows.
Hi, Dr Derek
I’m planning to write a tiny book about how to make a Weather App using JSON (writen in Indonesian language). (what i really want to do is converting your video tutorial into a tiny book).
that’s if i have your permission 🙂
what do you say?
Feel free to do anything with my code. The only request I ever make is that people don’t re-upload my videos to YouTube because if that is done very often YouTube takes down my videos. You can do anything else that you’d like 🙂
Thank you so much 😀
You’re very welcome 🙂
Hi Derek, thank you for all your videos!
I am quite confused why you aren’t promoting the use of ‘git status’ more, to give a nice status view – I use it all the time. I think that’s probably the most common keypress combination on my laptop.
Hi Dennis, You are very welcome 🙂 I didn’t use it as often as i would normally because I was just trying to show how everything works as quickly as possible. I entertained the idea of doing more on basic workflow, but decided to not go that way because people didn’t seem interested. i may go back and do that.