hi,
i have the following verson
Installed Apps
ERPNext: v5.0.0-beta
Open Source Enterprise Resource Planning for Small and Midsized Organizations
Frappe Framework: v5.0.0-beta
Full Stack Web Application Framework in Python
when i try to upgrade using
‘bench update --upgrade’ i get this error. pls help
[root@erp backups]# bench update --upgrade
remote: Counting objects: 8, done.
remote: Total 8 (delta 6), reused 6 (delta 6), pack-reused 2
Unpacking objects: 100% (8/8), done.
From GitHub - frappe/bench: CLI to manage Multi-tenant deployments for Frappe apps
ac02f7c…19e31b4 master → origin/master
Updating ac02f7c…19e31b4
error: Your local changes to the following files would be overwritten by merge:
bench/release.py
bench/utils.py
Please, commit your changes or stash them before you can merge.
Aborting
warning: Failed to read auxiliary vector, /proc not mounted?
warning: Failed to read auxiliary vector, /proc not mounted?
warning: Failed to read auxiliary vector, /proc not mounted?
warning: Failed to read auxiliary vector, /proc not mounted?
warning: Failed to read auxiliary vector, /proc not mounted?
warning: Failed to read auxiliary vector, /proc not mounted?
warning: Failed to read auxiliary vector, /proc not mounted?
warning: Failed to read auxiliary vector, /proc not mounted?
Traceback (most recent call last):
File “/usr/bin/bench”, line 9, in
load_entry_point(‘bench==0.1’, ‘console_scripts’, ‘bench’)()
File “/home/frappe/bench-repo/bench/cli.py”, line 60, in cli
bench()
File “/usr/lib/python2.7/site-packages/click/core.py”, line 610, in call
return self.main(*args, **kwargs)
File “/usr/lib/python2.7/site-packages/click/core.py”, line 590, in main
rv = self.invoke(ctx)
File “/usr/lib/python2.7/site-packages/click/core.py”, line 936, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/lib/python2.7/site-packages/click/core.py”, line 782, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/lib/python2.7/site-packages/click/core.py”, line 416, in invoke
return callback(*args, **kwargs)
File “/home/frappe/bench-repo/bench/cli.py”, line 229, in _update
update_bench()
File “/home/frappe/bench-repo/bench/utils.py”, line 219, in update_bench
exec_cmd(“git pull”, cwd=cwd)
File “/home/frappe/bench-repo/bench/utils.py”, line 104, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull