Error in Migration v4 to v5 patches

Hi,

I am getting this error due to a migration patch: http://pastebin.com/TCuBjsK3

I to have same problem

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.jso
n
erpnext/accounts/print_format/cheque_printing_format/cheque_printing_for
mat.json
erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_vo
ucher.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 ca
ll

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 invo
ke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 782, in invo
ke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 416, in invo
ke
return callback(*args, **kwargs)
File “/home/chandu/bench-repo/bench/cli.py”, line 233, in update
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

@talluri_chandu Your error seems to be more due to some changed made by you on the app and not comitted.

Its not related to any bench errors/