when trying to update bench “bench update” I get following error:
INFO:bench.utils:./env/bin/pip install Pillow
Requirement already satisfied: Pillow in ./env/lib/python2.7/site-packages
Cannot proceed with update: You have local changes in app “frappe” that are not committed.
Here are your choices:
- Merge the frappe app manually with “git pull” / “git pull --rebase” and fix conflicts.
- Temporarily remove your changes with “git stash” or discard them completely
with “bench update --reset” or for individual repositries “git reset --hard”
- If your changes are helpful for others, send in a pull request via GitHub and
wait for them to be merged in the core.
In erpnext and frappe directory I get git status:
On branch master
Your branch is up-to-date with ‘upstream/master’.
(use “git add …” to include in what will be committed)
nothing added to commit but untracked files present (use “git add” to track)
when using git stash it says: No local changes to save
bench update --reset is working and bench migrate too
any suggestions to getting a clean update with “bench update”?