git
discard all local changes/commits and pull from upstream
git reset --hard origin/master
git pull origin master
git
discard all local changes/commits and pull from upstream
git reset --hard origin/master
git pull origin master
lol this one has saved my life and my job, tnx.
Thanks! Worked like a charm