How can i fix this… Would someone help me how to fix this bug…
frappe@server: ~frappe-bench$ bench update
INFO: bench.utils:updating bench
INFO:bench.utils:git pull
Updating 94d346c…b77434b
error: Your local changes to the following files would be overwritten by merge:
MANIFEST.in
bench/init.py
bench/config/redis.py
bench/package.json
bench/patches/patches.txt
playbooks/develop/includes/setup_bench.yml
playbooks/develop/includes/setup_erpnext.yml
playbooks/develop/install.yml
playbooks/prerequisites/roles/nginx/tasks/main.yml
playbooks/production/includes/seup_bench_production.yml
playbooks/production/includes/setup_inputrc.yml
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
Please i really need help… Thanks