Instead of doing a &quot;git pull&quot;, some people[1] advise doing a &quot;git fetch&quot; followed by a &quot;git merge&quot;.<p>[1] - <a href="http:&#x2F;&#x2F;longair.net&#x2F;blog&#x2F;2009&#x2F;04&#x2F;16&#x2F;git-fetch-and-merge&#x2F;" rel="nofollow">http:&#x2F;&#x2F;longair.net&#x2F;blog&#x2F;2009&#x2F;04&#x2F;16&#x2F;git-fetch-and-merge&#x2F;</a>