I want to upgrade my erpnext v10.0.17 to latest 10.1.43. I gave this command “bench update” by frappe user from cd /home/frappe/frappe-bench/
then I got this error given below.
HEY! USE SCREEN $ cd frappe-bench
HEY! USE SCREEN $ bench update
INFO:bench.utils:updating bench
INFO:bench.utils:git pull
Updating 2cd29ac…18bf1b5
error: Your local changes to the following files would be overwritten by merge:
.gitignore
.travis.yml
MANIFEST.in
bench/init.py
bench/commands/config.py
bench/commands/install.py
bench/commands/utils.py
bench/config/common_site_config.py
bench/config/nginx.py
bench/config/redis.py
bench/config/supervisor.py
bench/config/templates/Procfile
bench/config/templates/nginx.conf
bench/package.json
bench/patches/patches.txt
bench/patches/v4/update_node.py
bench/tests/test_setup_production.py
completion.sh
playbooks/init.py
playbooks/develop/includes/setup_bench.yml
playbooks/develop/includes/setup_dev_env.yml
playbooks/develop/includes/setup_erpnext.yml
playbooks/develop/includes/setup_selinux_policy.yml
playbooks/develop/install.yml
playbooks/develop/macosx.yml
playbooks/develop/templates/mariadb_centos.repo
playbooks/prerequisites/debian.yml
playbooks/prerequisites/files/debian_mariadb_config.cnf
playbooks/prerequisites/files/mariadb_config.cnf
playbooks/prerequisites/files/nginx.conf
playbooks/prerequisites/install_prerequisites.yml
playbooks/prerequisites/install_roles.yml
playbooks/prerequisites/roles/bash_screen_wall/files/screen_wall.sh
playbooks/prerequisites/roles/bash_screen_wall/tasks/main.yml
playbooks/prerequisites/roles/dns_caching/handlers/main.yml
playbooks/prerequisites/roles/dns_caching/tasks/main.yml
playbooks/prerequisites/roles/fail2ban/defaults/main.yml
playbooks/prerequisites/roles/fail2ban/handlers/main.yml
playbooks/prerequisites/roles/fail2ban/tasks/configure_nginx_jail.yml
playbooks/prerequisites/roles/fail2ban/tasks/main.yml
playbooks/prerequisites/roles/fail2ban/templates/nginx-proxy-filter.conf.j2
playbooks/prerequisites/roles/fail2ban/templates/nginx-proxy-jail.conf.j2
playbooks/prerequisites/roles/frappe_selinux/files/frappe_selinux.te
playbooks/prerequisites/roles/frappe_selinux/tasks/main.yml
playbooks/prerequisites/roles/locale/defaults/main.yml
playbooks/prerequisites/roles/locale/tasks/main.yml
playbooks/prerequisites/roles/logwatch/defaults/main.yml
playbooks/prerequisites/roles/logwatch/tasks/main.yml
playbooks/prerequisites/roles/logwatch/templates/logwatch.conf.j2
playbooks/prerequisites/roles/mariadb/README.md
playbooks/prerequisites/roles/mariadb/defaults/main.yml
playbooks/prerequisites/roles/mariadb/handlers/main.yml
playbooks/prerequisites/roles/mariadb/meta/main.yml
playbooks/prerequisites/roles/mariadb/tasks/centos.yml
playbooks/prerequisites/roles/mariadb/tasks/debian.yml
playbooks/prerequisites/roles/mariadb/tasks/main.yml
playbooks/prerequisites/roles/mariadb/tasks/mysql_secure_installation.yml
playbooks/prerequisites/roles/mariadb/tasks/ubuntu.yml
playbooks/prerequisites/roles/mariadb/templates/mariadb_centos.repo.j2
playbooks/prerequisites/roles/mariadb/templates/mariadb_ubuntu.list.j2
playbooks/prerequisites/roles/mariadb/templates/my.cnf.j2
playbooks/prerequisites/roles/mariadb/vars/main.yml
playbooks/prerequisites/roles/nginx/.travis.yml
playbooks/prerequisites/roles/nginx/README.md
playbooks/prerequisites/roles/nginx/defaults/main.yml
playbooks/prerequisites/roles/nginx/handlers/main.yml
playbooks/prerequisites/roles/nginx/meta/main.yml
playbooks/prerequisites/roles/nginx/tasks/main.yml
playbooks/prerequisites/roles/nginx/tasks/setup-Debian.yml
playbooks/prerequisites/roles/nginx/tasks/setup-RedHat.yml
playbooks/prerequisites/roles/nginx/tasks/vhosts.yml
playbooks/prerequisites/roles/nginx/templates/nginx.conf.j2
playbooks/prerequisites/roles/nginx/templates/nginx.repo.j2
playbooks/prerequisites/roles/nginx/templates/vhosts.j2
playbooks/prerequisites/roles/nginx/tests/inventory
playbooks/prerequisites/roles/nginx/tests/test.yml
playbooks/prerequisites/roles/nginx/vars/Debian.yml
playbooks/prerequisites/roles/nginx/vars/RedHat.yml
playbooks/prerequisites/roles/nodejs/tasks/main.yml
playbooks/prerequisites/roles/ntpd/tasks/main.yml
playbooks/prerequisites/roles/psutil/tasks/main.yml
playbooks/prerequisites/roles/supervisor/tasks/main.yml
playbooks/prerequisites/roles/swap/defaults/main.yml
playbooks/prerequisites/roles/swap/tasks/main.yml
playbooks/prerequisites/roles/wkhtmltopdf/tasks/main.yml
playbooks/prerequisites/setup_essentials.yml
playbooks/prerequisites/setup_nginx_proxy_jail.yml
playbooks/prerequisites/ubuntu.yml
playbooks/production/includes/setup_bench_production.yml
playbooks/production/includes/setup_inputrc.yml
playbooks/production/install.yml
requirements.txt
setup.py
vm/Readme.md
vm/ansible/base.yml
vm/ansible/library/bench.py
vm/ansible/roles/mariadb/README.md
vm/ansible/roles/mariadb/defaults/main.yml
vm/ansible/roles/mariadb/handlers/main.yml
vm/ansible/roles/mariadb/meta/main.yml
vm/ansible/roles/mariadb/tasks/centos.yml
vm/ansible/roles/mariadb/tasks/main.yml
vm/ansible/roles/mariadb/tasks/mysql_secure_installation.yml
vm/ansible/roles/mariadb/tasks/ubuntu.yml
vm/ansible/roles/mariadb/templates/mariadb_centos.repo.j2
vm/ansible/roles/mariadb/templates/mariadb_ubuntu.list.j2
vm/ansible/roles/mariadb/templates/my.cnf.j2
vm/ansible/roles/mariadb/vars/main.yml
vm/ansible/roles/nginx/.travis.yml
vm/ansible/roles/nginx/README.md
vm/ansible/roles/nginx/defaults/main.yml
vm/ansible/roles/nginx/handlers/main.yml
vm/ansible/roles/nginx/meta/main.yml
vm/ansible/roles/nginx/tasks/main.yml
vm/ansible/roles/nginx/tasks/setup-Debian.yml
vm/ansible/roles/nginx/tasks/setup-RedHat.yml
vm/ansible/roles/nginx/tasks/vhosts.yml
vm/ansible/roles/nginx/templates/nginx.conf.j2
vm/ansible/roles/nginx/templates/nginx.repo.j2
vm/ansible/roles/nginx/templates/vhosts.j2
vm/ansible/roles/nginx/tests/inventory
vm/ansible/roles/nginx/tests/test.yml
vm/ansible/roles/nginx/vars/Debian.yml
vm/ansible/roles/nginx/vars/RedHat.yml
vm/ansible/roles/swap/defaults/main.yml
vm/ansible/roles/swap/tasks/main.yml
vm/ansible/roles/wkhtmltopdf/defaults/main.yml
vm/ansible/roles/wkhtmltopdf/tasks/main.yml
vm/ansible/templates/mariadb_config.cnf
vm/ansible/templates/nginx.conf
vm/ansible/vars.yml
vm/ansible/vm.yml
vm/ansible/vm_vars/all.yml
vm/build.py
vm/scripts/install_ansible.sh
vm/scripts/set_message.sh
vm/scripts/zerofree.sh
vm/vm.json
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/bench/cli.py”, line 40, in cli
bench_command()
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 722, in call
return self.main(*args, **kwargs)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 697, in main
rv = self.invoke(ctx)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 1066, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 895, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 535, in invoke
return callback(*args, **kwargs)
File “/home/frappe/.bench/bench/commands/update.py”, line 34, in update
update_bench()
File “/home/frappe/.bench/bench/utils.py”, line 256, in update_bench
exec_cmd(“git pull”, cwd=cwd)
File “/home/frappe/.bench/bench/utils.py”, line 140, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull
Now please tell me what can I do?