Bench Update Error - Pip / Pillow / python

Hi ERPNext’ies,

when trying to update bench “bench update” I get following error:


INFO:bench.utils:updating bench
INFO:bench.utils:git pull
Already up-to-date.
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:

  1. Merge the frappe app manually with “git pull” / “git pull --rebase” and fix conflicts.
  2. Temporarily remove your changes with “git stash” or discard them completely
    with “bench update --reset” or for individual repositries “git reset --hard”
  3. 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’.
Untracked files:
(use “git add …” to include in what will be committed)

patches.txt

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”?

Thanks

If you want to remove untracked files.
First, add them using -> git add --all
then use -> git stash and final bench update

Thanks that worked :slight_smile: