git, how to I go back to origin master after pulling a branch
- by fishtoprecords
This has to be a FAQ, but I can't find it googling.
Another person created a branch, commit'd to it, and pushed it to github using
git push origin newbranch
I successfully pulled it down using
git pull origin newbranch
Now, I want to go back to the origin master version.
Nothing I do seems to cause the files in the origin master to replace those in the newbranch.
git checkout master
git checkout origin master
git pull
git pull origin HEAD
etc
git pull origin master returns:
* branch master -> FETCH_HEAD
Already up-to-date.
This can't be hard, but I sure can't figure it out.
'git branch' returns
* master
and 'git branch -r' return
origin/HEAD
origin/experimental
origin/master
