root@vps219355:~# bench update --bench
INFO:bench.utils:updating bench
Updating ba772ae…98ab396
error: Your local changes to the following files would be overwritten by merge:
README.md
bench/init.py
bench/config/lets_encrypt.py
bench/config/nginx.py
bench/config/templates/nginx.conf
playbooks/develop/centos.yml
playbooks/develop/create_user.yml
playbooks/develop/includes/setup_mariadb.yml
playbooks/develop/install.yml
playbooks/develop/ubuntu.yml
playbooks/install.py
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
playbooks/develop/debian.yml
playbooks/develop/includes/mariadb_debian.yml
Please move or remove them before you can merge.
Aborting
Traceback (most recent call last):
File “/usr/local/bin/bench”, line 9, in
load_entry_point(‘bench==0.92’, ‘console_scripts’, ‘bench’)()
File “/home/frappe/bench-repo/bench/cli.py”, line 40, in cli
bench_command()
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 700, in call
return self.main(*args, **kwargs)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 680, in main
rv = self.invoke(ctx)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 1027, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 873, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 508, in invoke
return callback(*args, **kwargs)
File “/home/frappe/bench-repo/bench/commands/update.py”, line 34, in update
update_bench()
File “/home/frappe/bench-repo/bench/utils.py”, line 190, in update_bench
exec_cmd(“git pull”, cwd=cwd)
File “/home/frappe/bench-repo/bench/utils.py”, line 90, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull