Just clean up the mess and make it like the remote master branch again:
git fetch origin git reset --hard origin/master git clean -f -d
Your local branch is now an exact copy of the remote branch.