Upgrade Issue from version 10.0.17

[clarkej]

A forum search often will point you with clues and what to try to proceed -

Search on “Please, commit your changes or stash them before you can merge.” offers this gem

Bench update: Please, commit your changes or stash them before you can merge - #3 by shreyasdk

New bench update error

frappe@localhost:~/frappe-bench$ bench update INFO:bench.utils:updating bench INFO:bench.utils:git pull Updating a6a1ee9…b5a0290 error: Your local changes to the following files would be overwritten by merge: playbooks/develop/includes/setup_dev_env.yml Please, commit your changes or stash them before you can merge. Aborting Traceback (most recent call last): File “/usr/local/bin/bench”, line 11, in load_entry_point(‘bench’, ‘console_scripts’, ‘bench’)() File “/home/frappe/.bench/ben…