git fetch-all and merge-upstream