aafpl@ubuntu:/home/frappe/frappe-bench$ sudo bench update
[sudo] password for aafpl:
INFO:bench.utils:updating bench
Already up-to-date.
remote: Counting objects: 66, done.
remote: Compressing objects: 100% (38/38), done.
remote: Total 66 (delta 51), reused 43 (delta 28), pack-reused 0
Unpacking objects: 100% (66/66), done.
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript
3b8f3a5…bab65fd master → upstream/master
- [new tag] v7.0.9 → v7.0.9
- [new tag] v7.0.8 → v7.0.8
Requirement already satisfied (use --upgrade to upgrade): Pillow in ./env/lib/python2.7/site-packages
INFO:bench.app:pulling frappe
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript - branch master → FETCH_HEAD
Updating 3b8f3a5…bab65fd
error: Your local changes to the following files would be overwritten by merge:
frappe/init.py
frappe/email/smtp.py
frappe/model/base_document.py
frappe/public/css/desk.css
frappe/public/css/form.css
frappe/public/css/page.css
frappe/public/js/frappe/form/formatters.js
frappe/public/less/desk.less
frappe/public/less/form.less
frappe/public/less/page.less
frappe/website/website_generator.py
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
File “/usr/local/bin/bench”, line 9, 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 716, in call
return self.main(*args, **kwargs)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 696, in main
rv = self.invoke(ctx)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 1060, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 889, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 534, in invoke
return callback(*args, **kwargs)
File “/home/frappe/.bench/bench/commands/update.py”, line 60, in update
_update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force)
File “/home/frappe/.bench/bench/commands/update.py”, line 76, in _update
pull_all_apps(bench_path=bench_path)
File “/home/frappe/.bench/bench/app.py”, line 148, in pull_all_apps
remote=remote, branch=get_current_branch(app, bench_path=bench_path)), cwd=app_dir)
File “/home/frappe/.bench/bench/utils.py”, line 90, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull upstream master