To get local to match remote branch – particularly after remote has been rebased (preferred – keeps history linear) or merged:
git stash save "stash-name"
git reset --hard origin/branch
git stash pop
git status
git stash list
git branch -vv
git remote -v
There was an error while loading. Please reload this page.