GIT reset branch to follow origin master
#reset file to follow origin master git checkout origin/master <path_to_file>
git reset --hard origin/master