Pull and overwrite local master:
$ git fetch
$ git branch old-master
$ git reset --hard origin/master
$ git merge -s ours old-master
Frontend Designer excited about bridging the gap between design and code.
Pull and overwrite local master:
$ git fetch
$ git branch old-master
$ git reset --hard origin/master
$ git merge -s ours old-master