I was re-reading this and realized that it's vital to make sure you are ALREADY on master branch before you do the git pull upstream master, otherwise it would end up merging upstream/master into whatever other branch you happened to be on at the time, instead of merging upstream/master into your master. Therefore steps 5 and 6 were in the wrong order.
I was re-reading this and realized that it's vital to make sure you are ALREADY on master branch before you do the
git pull upstream master, otherwise it would end up merging upstream/master into whatever other branch you happened to be on at the time, instead of merging upstream/master into your master. Therefore steps 5 and 6 were in the wrong order.