chandu@myerp:~/eipl/frappe-bench$ bench retry-upgrade
From GitHub - frappe/shopping_cart: Online Shopping Cart integrated with ERPNext
- branch develop → FETCH_HEAD
Already up-to-date.
From GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP) - branch develop → FETCH_HEAD
Updating 4944fb3…2437d4c
error: Your local changes to the following files would be overwritten by merge:
erpnext/accounts/doctype/pos_setting/pos_setting.js
erpnext/accounts/doctype/pos_setting/pos_setting.json
erpnext/accounts/doctype/pos_setting/pos_setting.py
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
erpnext/accounts/print_format/cheque_printing_format/cheque_printing_format.json
erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
erpnext/hr/doctype/leave_allocation/leave_allocation.js
erpnext/hr/doctype/leave_allocation/leave_allocation.py
erpnext/hr/doctype/leave_application/leave_application.js
erpnext/hr/doctype/leave_application/leave_application.py
erpnext/setup/doctype/sms_settings/sms_settings.json
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
Please, commit your changes or stash them before you can merge.
Aborting
Error: None
Traceback (most recent call last):
File “/usr/local/bin/bench”, line 9, in
load_entry_point(‘bench==0.1’, ‘console_scripts’, ‘bench’)()
File “/home/chandu/bench-repo/bench/cli.py”, line 55, in cli
bench()
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 610, in call
return self.main(*args, **kwargs)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 590, in main
rv = self.invoke(ctx)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 936, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 782, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 416, in invoke
return callback(*args, **kwargs)
File “/home/chandu/bench-repo/bench/cli.py”, line 262, in retry_upgrade
pull_all_apps()
File “/home/chandu/bench-repo/bench/app.py”, line 91, in pull_all_apps
exec_cmd(“git pull {rebase} upstream {branch}”.format(rebase=rebase, branch=get_current_branch(app_dir)), cwd=app_dir)
File “/home/chandu/bench-repo/bench/utils.py”, line 72, in exec_cmd
subprocess.check_call(cmd, cwd=cwd, shell=True)
File “/usr/lib/python2.7/subprocess.py”, line 540, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command ‘git pull upstream develop’ returned non-zero exit status 1