I cant run bench update

1

i trying to update for the last version by comand bench update
always i get error

  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.

i try with fresh installation same error
so every time i go to /apps/frappe and run git pull and then do that to /apps/erpnext
then i migrate
is that ok ??? and if there is any right way to do bench update

production mode
frappe 14
erpnext 14

2

This happens because the frappe app you have in the bench is not the same as what is in the remote repository… (You have local changes in app “frappe” that are not committed), so you have to manually do what the bench update does.
You have no other choice, but to re-install the “frappe-bench” again from its source.

3

You have no other choice, but to re-install the “frappe-bench” again from its source.

lolno.

The error is quite well explained? The update is failing because you have some changes in some app files.

You can find diff by doing git status inside /apps/frappe folder.

If you know you have not modified code files then you can just ignore it all and do bench update --reset it will discard local changes and carry on.

4

i did not make any changes
so its ok to do git pull every time to update ?