I have a local branch of a project (\"configUpdate\") that I\'ve forked from somebody else\'s project and I\'ve done a load of changes on it and would like to merge the changes
I found out it was:
$ git fetch upstream $ git merge upstream/master