Here is an excellent post addressing some common issues you may encounter when working with remote branches in git. The author provides a particularly helpful explanation for why it is a good idea not to use “git pull”, but rather use “git fetch” and then merge the changes into your working tree as a separate step. This is particularly helpful in my case, where I am working with a distributed team of developers, some of which are located in a foreign country. By fetching their changes first, examining the changes, and then merging them into my working tree, I can catch errors and bad code before it becomes a part of the code base.
