This doesn't work for me. I am sure, that I don't have any local changes.
Even when I do git reset --hard on the next try, it will tell me
Cannot proceed with update: You have local changes in app "frappe" that are not committed.
Here are your choices:
1. Merge the frappe app manually with "git pull" / "git pull --rebase" and fix conflicts.
1. Temporarily remove your changes with "git stash" or discard them completely
with "bench update --reset" or for individual repositries "git reset --hard"
2. If your changes are helpful for others, send in a pull request via GitHub and
wait for them to be merged in the core.