Having difficulty grasping GIT? Unsure when you should pull vs. fetch vs. rebase?
This tutorial may the the answer. It gives, in a very approachable manner, a step by step walk thru of what git is doing behind the scenes and when to use the most common commands.