Everytime, I update I get this error and I did git stash 10 times in frappe, frappe/frappe and erpnext folder but still the error is coming.
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.
This is working as well, because of the --reset but on the next run, you will have the same error or similiar:
Cannot proceed with update: You have local changes in app "erpnext" that are not committed.
Here are your choices:
1. Merge the erpnext 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.
I am close to a solution. Actually, I found a solution already.
Go to the directory, either frappe-bench/apps/erpnext or frappe-bench/apps/frappe
Type git status
Check the list of the untracked files. There might be files, which do or don’t belong there.
Type git add --all to track those files
Type git stash
Run bench update
It should run successfully, if not, start over with 1. and repeat for the other directory
On this point you’re already done, but you may want to apply your changes, which you stashed. So continue with 8. if you stashed things, which you consider important.
8 . While you’re still in the folder, either frappe-bench/apps/erpnext or frappe-bench/apps/frappe type git stash apply
Your changes will be applied again, but on the next run, you will run into the same issue like you had before.
So 1. - 7. was the solution we were looking for.
Maybe someone can tell, why “print formats” and “support/web forms” are breaking bench update. These are my files:
After all these steps it works but at last i see this error
/home/sarwar/frappe-bench/apps/frappe/frappe/build.js:20
const app_paths = apps.map(app => p(apps_path, app, app)) // base_path of each
^
SyntaxError: Unexpected token >
at Module._compile (module.js:439:25)
at Object.Module._extensions…js (module.js:474:10)
at Module.load (module.js:356:32)
at Function.Module._load (module.js:312:12)
at Function.Module.runMain (module.js:497:10)
at startup (node.js:119:16)
at node.js:906:3
Please help.
Backing up sites…
Patching sites…
Migrating hroms.erp2
Updating DocTypes for frappe : [========================================]
Updating DocTypes for erpnext : [========================================]
Syncing help database…
/home/sarwar/frappe-bench/apps/frappe/frappe/build.js:20
const app_paths = apps.map(app => p(apps_path, app, app)) // base_path of each
^
SyntaxError: Unexpected token >
at Module._compile (module.js:439:25)
at Object.Module._extensions…js (module.js:474:10)
at Module.load (module.js:356:32)
at Function.Module._load (module.js:312:12)
at Function.Module.runMain (module.js:497:10)
at startup (node.js:119:16)
at node.js:906:3