Shouldn't 'git push' be the last command for upstream merge? (https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/)