$ git checkout dev
$ git fetch upstream
$ git merge upstream/dev