Getting Error on bench update --upgrade

Celina_Arroyo_Gutier · August 10, 2016, 9:12pm

INFO:bench.utils:updating bench
Already up-to-date.
Requirement already satisfied (use --upgrade to upgrade): Pillow in ./env/lib/python2.7/site-packages
INFO:bench.app:pulling frappe
De
* branch            develop    -> FETCH_HEAD
Already up-to-date.
INFO:bench.app:pulling erpnext
De
* branch            develop    -> FETCH_HEAD

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'tiba@tiba-erpnextproduct.(none)')
Traceback (most recent call last):
File "/usr/local/bin/bench", line 9, in <module>
load_entry_point('bench==0.0.0', 'console_scripts', 'bench')()
File "/home/tiba/bench-repo/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/tiba/bench-repo/bench/commands/update.py", line 60, in update
 _update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force)
File "/home/tiba/bench-repo/bench/commands/update.py", line 76, in _update
pull_all_apps(bench_path=bench_path)
File "/home/tiba/bench-repo/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/tiba/bench-repo/bench/utils.py", line 130, in exec_cmd
 raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream develop

How to Fix this???

Ben_Cornwell_Mott · August 10, 2016, 9:17pm

Please read the content of the error:

git config --global user.email “you@example.com”
git config --global user.name “Your Name”

to set your account’s default identity.
Omit --global to set the identity only in this repository.

Celina_Arroyo_Gutier · August 10, 2016, 9:21pm

Ok I omit --global but the Error is same

root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/frappe# git config user.email "tiba@tiba-erpnextproduct.com"
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/frappe# git config user.name "tiba"
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/frappe# bench update --upgrade
INFO:bench.utils:updating bench
Already up-to-date.
Requirement already satisfied (use --upgrade to upgrade): Pillow in ./env/lib/python2.7/site-packages
INFO:bench.app:pulling frappe
De 
 * branch            develop    -> FETCH_HEAD
Already up-to-date.
INFO:bench.app:pulling erpnext
De 
 * branch            develop    -> FETCH_HEAD

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'tiba@tiba-erpnextproduct.(none)')
Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench==0.0.0', 'console_scripts', 'bench')()
  File "/home/tiba/bench-repo/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/tiba/bench-repo/bench/commands/update.py", line 60, in update
    _update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force)
  File "/home/tiba/bench-repo/bench/commands/update.py", line 76, in _update
    pull_all_apps(bench_path=bench_path)
  File "/home/tiba/bench-repo/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/tiba/bench-repo/bench/utils.py", line 130, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream develop
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/frappe#

Ben_Cornwell_Mott · August 10, 2016, 9:26pm

Did you try:

git config --global user.email “you@example.com”
git config --global user.name “Your Name”

Celina_Arroyo_Gutier · August 10, 2016, 9:32pm

Yes, I did try but I get the same error.

This sintaxis should be run on specific folder

Ben_Cornwell_Mott · August 10, 2016, 9:44pm

can you go to the apps/erpnext folder and type:

git status

What is the result?

Celina_Arroyo_Gutier · August 10, 2016, 10:11pm

Result:

En la rama develop
Your branch and 'upstream/develop' have diverged,clear
and have 1 and 1326 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean

Ben_Cornwell_Mott · August 10, 2016, 10:13pm

So that seems to be the issue.

Try using git reset --hard and see what happens
If the doesn’t work, try git pull upstream develop --force

Celina_Arroyo_Gutier · August 10, 2016, 10:32pm

With git reset --hard the mistake continue.

With git pull upstream develop --force this is the result when I run:  bench update --upgrade



root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext# git pull upstream develop --force

 * branch            develop    -> FETCH_HEAD
Automezclado erpnext/translations/es.csv
CONFLICTO(contenido): conflicto de fusión en erpnext/translations/es.csv
Eliminando erpnext/templates/pages/edit_profile.py
Eliminando erpnext/templates/pages/edit-profile.html
Eliminando erpnext/templates/includes/product_search_box.html
Eliminando erpnext/templates/includes/product_in_list.html
Eliminando erpnext/templates/includes/product_in_grid.html
Eliminando erpnext/templates/includes/order/order.css
Eliminando erpnext/templates/form_grid/material_request_grid.html
Eliminando erpnext/tasks.py
Eliminando erpnext/support/report/maintenance_schedules/__init__.py
Eliminando erpnext/support/doctype/maintenance_visit/__init__.py
Eliminando erpnext/support/doctype/maintenance_schedule_item/__init__.py
Eliminando erpnext/support/doctype/maintenance_schedule_detail/__init__.py
Eliminando erpnext/support/doctype/maintenance_schedule/__init__.py
Automezclado erpnext/stock/doctype/item/item.json
CONFLICTO(contenido): conflicto de fusión en erpnext/stock/doctype/item/item.json
Eliminando erpnext/setup/setup_wizard/data/sample_home_page.html
Eliminando erpnext/setup/setup_wizard/data/sample_home_page.css
Automezclado erpnext/setup/doctype/uom/uom.json
CONFLICTO(contenido): conflicto de fusión en erpnext/setup/doctype/uom/uom.json
Automezclado erpnext/setup/doctype/item_group/item_group.json
CONFLICTO(contenido): conflicto de fusión en erpnext/setup/doctype/item_group/item_group.json
Eliminando erpnext/setup/doctype/features_setup/features_setup.py
Eliminando erpnext/setup/doctype/features_setup/features_setup.js
Eliminando erpnext/setup/doctype/features_setup/__init__.py
Eliminando erpnext/setup/doctype/features_setup/README.md
Automezclado erpnext/setup/doctype/currency_exchange/currency_exchange.json
CONFLICTO(contenido): conflicto de fusión en erpnext/setup/doctype/currency_exchange/currency_exchange.json
Eliminando erpnext/selling/page/sales_browser/sales_browser.py
Eliminando erpnext/selling/page/sales_browser/sales_browser.json
Eliminando erpnext/selling/page/sales_browser/sales_browser.js
Eliminando erpnext/selling/page/sales_browser/__init__.py
Eliminando erpnext/selling/page/sales_browser/README.md
Automezclado erpnext/schools/doctype/student_group_student/student_group_student.json
Automezclado erpnext/schools/doctype/student_batch_student/student_batch_student.json
Automezclado erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
Automezclado erpnext/schools/doctype/room/room.json
Automezclado erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
Automezclado erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json
Automezclado erpnext/schools/doctype/program/program.json
Automezclado erpnext/schools/doctype/fee_category/fee_category.json
Automezclado erpnext/schools/doctype/assessment_result/assessment_result.json
Automezclado erpnext/schools/doctype/assessment_group/assessment_group.json
Automezclado erpnext/schools/doctype/announcement/announcement.json
Eliminando erpnext/public/js/pos/pos.js
Eliminando erpnext/public/js/feature_setup.js
Automezclado erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
Eliminando erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
Eliminando erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json
Eliminando erpnext/projects/report/daily_time_log_summary/__init__.py
Eliminando erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.py
Eliminando erpnext/projects/doctype/time_log_batch_detail/__init__.py
Eliminando erpnext/projects/doctype/time_log_batch_detail/README.md
Eliminando erpnext/projects/doctype/time_log_batch/time_log_batch_list.js
Eliminando erpnext/projects/doctype/time_log_batch/time_log_batch.py
Eliminando erpnext/projects/doctype/time_log_batch/time_log_batch.js
Eliminando erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
Eliminando erpnext/projects/doctype/time_log_batch/__init__.py
Eliminando erpnext/projects/doctype/time_log_batch/README.md
Eliminando erpnext/projects/doctype/time_log/time_log_list.js
Eliminando erpnext/projects/doctype/time_log/time_log_calendar.js
Eliminando erpnext/projects/doctype/time_log/time_log.py
Eliminando erpnext/projects/doctype/time_log/time_log.js
Eliminando erpnext/projects/doctype/time_log/test_time_log.py
Eliminando erpnext/projects/doctype/time_log/test_records.json
Eliminando erpnext/projects/doctype/time_log/__init__.py
Eliminando erpnext/projects/doctype/time_log/README.md
Automezclado erpnext/modules.txt
CONFLICTO(contenido): conflicto de fusión en erpnext/modules.txt
Eliminando erpnext/manufacturing/page/bom_browser/bom_browser.py
Eliminando erpnext/manufacturing/page/bom_browser/bom_browser.json
Eliminando erpnext/manufacturing/page/bom_browser/bom_browser.js
Eliminando erpnext/manufacturing/page/bom_browser/__init__.py
Automezclado erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json
Automezclado erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
Automezclado erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
Automezclado erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
Automezclado erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
Automezclado erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py
Automezclado erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
Automezclado erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
Automezclado erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
Automezclado erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
Automezclado erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
Automezclado erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
Automezclado erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
Automezclado erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
Automezclado erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
Eliminando erpnext/hr/report/employee_holiday_attendance/__init__.py
Eliminando erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py
Eliminando erpnext/hr/doctype/salary_structure_earning/__init__.py
Eliminando erpnext/hr/doctype/salary_structure_earning/README.md
Eliminando erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py
Eliminando erpnext/hr/doctype/salary_structure_deduction/__init__.py
Eliminando erpnext/hr/doctype/salary_structure_deduction/README.md
Eliminando erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py
Eliminando erpnext/hr/doctype/salary_slip_earning/__init__.py
Eliminando erpnext/hr/doctype/salary_slip_earning/README.md
Eliminando erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py
Eliminando erpnext/hr/doctype/salary_slip_deduction/__init__.py
Eliminando erpnext/hr/doctype/salary_slip_deduction/README.md
Automezclado erpnext/hr/doctype/salary_detail/salary_detail.json
Automezclado erpnext/hr/doctype/salary_component/salary_component.json
Automezclado erpnext/hr/doctype/interest/interest.py
Eliminando erpnext/hr/doctype/earning_type/test_records.json
Eliminando erpnext/hr/doctype/earning_type/test_earning_type.py
Eliminando erpnext/hr/doctype/earning_type/earning_type.py
Eliminando erpnext/hr/doctype/earning_type/__init__.py
Eliminando erpnext/hr/doctype/earning_type/README.md
Eliminando erpnext/hr/doctype/deduction_type/test_records.json
Eliminando erpnext/hr/doctype/deduction_type/test_deduction_type.py
Eliminando erpnext/hr/doctype/deduction_type/deduction_type.py
Eliminando erpnext/hr/doctype/deduction_type/__init__.py
Eliminando erpnext/hr/doctype/deduction_type/README.md
Eliminando erpnext/fixtures/web_form.json
Eliminando erpnext/docs/user/manual/en/using-erpnext/messages.md
Eliminando erpnext/docs/user/manual/en/stock/articles/managing-assets.md
Automezclado erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
Eliminando erpnext/docs/user/manual/en/projects/time-log.md
Eliminando erpnext/docs/user/manual/en/accounts/opening-entry.md
Eliminando erpnext/docs/user/manual/en/accounts/making-payments.md
Automezclado erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
Eliminando erpnext/docs/assets/old_images/erpnext/trial-balance-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/todo-list.png
Eliminando erpnext/docs/assets/old_images/erpnext/todo-close.png
Eliminando erpnext/docs/assets/old_images/erpnext/tags-in-list.png
Eliminando erpnext/docs/assets/old_images/erpnext/pos-remove-item.png
Eliminando erpnext/docs/assets/old_images/erpnext/pos-make-payment.png
Eliminando erpnext/docs/assets/old_images/erpnext/pos-add-item.png
Eliminando erpnext/docs/assets/old_images/erpnext/opening-entry-2.png
Eliminando erpnext/docs/assets/old_images/erpnext/note.png
Eliminando erpnext/docs/assets/old_images/erpnext/note-permission.png
Eliminando erpnext/docs/assets/old_images/erpnext/message-to.png
Eliminando erpnext/docs/assets/old_images/erpnext/message-list.png
Eliminando erpnext/docs/assets/old_images/erpnext/image-temp-opening.png
Eliminando erpnext/docs/assets/old_images/erpnext/forms.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-4-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-3.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-2-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/assigned-to.png
Eliminando erpnext/docs/assets/old_images/erpnext/assigned-to-icon.png
Eliminando erpnext/docs/assets/old_images/erpnext/assign-user.png
Eliminando erpnext/docs/assets/old_images/erpnext/assign-todo.png
Eliminando erpnext/docs/assets/old_images/erpnext/assign-remove.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-5.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-4.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-3.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-2.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/accounting-for-stock-1.png
Automezclado erpnext/crm/doctype/opportunity/opportunity.json
CONFLICTO(contenido): conflicto de fusión en erpnext/crm/doctype/opportunity/opportunity.json
Eliminando erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
Eliminando erpnext/crm/doctype/newsletter_list_subscriber/__init__.py
Eliminando erpnext/crm/doctype/newsletter_list/test_records.json
Eliminando erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
Eliminando erpnext/crm/doctype/newsletter_list/newsletter_list.py
Eliminando erpnext/crm/doctype/newsletter_list/newsletter_list.js
Eliminando erpnext/crm/doctype/newsletter_list/__init__.py
Eliminando erpnext/crm/doctype/newsletter/test_newsletter.py
Eliminando erpnext/crm/doctype/newsletter/newsletter_list.js
Eliminando erpnext/crm/doctype/newsletter/newsletter.py
Eliminando erpnext/crm/doctype/newsletter/newsletter.js
Eliminando erpnext/crm/doctype/newsletter/__init__.py
Automezclado erpnext/crm/doctype/lead/lead.json
CONFLICTO(contenido): conflicto de fusión en erpnext/crm/doctype/lead/lead.json
Automezclado erpnext/config/desktop.py
CONFLICTO(contenido): conflicto de fusión en erpnext/config/desktop.py
Automezclado erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
CONFLICTO(contenido): conflicto de fusión en erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
Automezclado erpnext/buying/doctype/supplier/supplier.json
CONFLICTO(contenido): conflicto de fusión en erpnext/buying/doctype/supplier/supplier.json
Eliminando erpnext/accounts/page/pos/pos_page.html
Eliminando erpnext/accounts/page/financial_analytics/financial_analytics.json
Eliminando erpnext/accounts/page/financial_analytics/financial_analytics.js
Eliminando erpnext/accounts/page/financial_analytics/__init__.py
Eliminando erpnext/accounts/page/financial_analytics/README.md
Eliminando erpnext/accounts/page/accounts_browser/accounts_browser.py
Eliminando erpnext/accounts/page/accounts_browser/accounts_browser.json
Eliminando erpnext/accounts/page/accounts_browser/accounts_browser.js
Eliminando erpnext/accounts/page/accounts_browser/__init__.py
Eliminando erpnext/accounts/page/accounts_browser/README.md
Automezclado erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
CONFLICTO(contenido): conflicto de fusión en erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
Eliminando erpnext/accounts/doctype/payment_tool_detail/__init__.py
Eliminando erpnext/accounts/doctype/payment_tool/test_payment_tool.py
Eliminando erpnext/accounts/doctype/payment_tool/payment_tool.py
Eliminando erpnext/accounts/doctype/payment_tool/payment_tool.js
Eliminando erpnext/accounts/doctype/payment_tool/__init__.py
Automezclado erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
Automezclado erpnext/accounts/doctype/cost_center/cost_center.json
CONFLICTO(contenido): conflicto de fusión en erpnext/accounts/doctype/cost_center/cost_center.json
Automezclado erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py
Automezclado erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
Eliminando erpnext/accounts/doctype/budget_detail/budget_detail.py
Eliminando erpnext/accounts/doctype/budget_detail/__init__.py
Eliminando erpnext/accounts/doctype/budget_detail/README.md
Automezclado erpnext/accounts/doctype/asset/asset.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china_small_business.json
Eliminando erpnext/__version__.py
Eliminando ci/my_config.h.patch
Eliminando ci/fix-mariadb.sh
Eliminando CONTRIBUTING.md
Automatic merge failed; fix conflicts and then commit the result.
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext# bench update --upgrade
INFO:bench.utils:updating bench
Already up-to-date.
Requirement already satisfied (use --upgrade to upgrade): Pillow in ./env/lib/python2.7/site-packages
INFO:bench.app:pulling frappe
De 
 * branch            develop    -> FETCH_HEAD
Already up-to-date.
INFO:bench.app:pulling erpnext
error: Pull is not possible because you have unmerged files.
consejo: Fix them up in the work tree, and then use 'git add/rm <file>'
consejo: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench==0.0.0', 'console_scripts', 'bench')()
  File "/home/tiba/bench-repo/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/tiba/bench-repo/bench/commands/update.py", line 60, in update
    _update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force)
  File "/home/tiba/bench-repo/bench/commands/update.py", line 76, in _update
    pull_all_apps(bench_path=bench_path)
  File "/home/tiba/bench-repo/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/tiba/bench-repo/bench/utils.py", line 130, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream develop

Ben_Cornwell_Mott · August 10, 2016, 10:42pm

Try git reset ---hard and git pull upstream develop --force a few times until the git status doesn’t give any errors. If that doesn’t work, try git fetch upstream --force

Celina_Arroyo_Gutier · August 10, 2016, 10:47pm

When I run: git pull upstream develop --force the result is:

fatal: Couldn't find remote ref force
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext#

Ben_Cornwell_Mott · August 10, 2016, 10:48pm

Can you try git remote -v ? You should get the following result:

upstream GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP) (fetch)
upstream GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP) (push)

Celina_Arroyo_Gutier · August 10, 2016, 10:50pm

Yes I do that. The result is the same.

Ben_Cornwell_Mott · August 10, 2016, 10:54pm

Did git fetch work? Please post the result of each command…

Celina_Arroyo_Gutier · August 10, 2016, 10:55pm

root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext# git status
En la rama develop
Your branch and 'upstream/develop' have diverged,
and have 1 and 1326 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext# git fetch upstream --force
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext#

Ben_Cornwell_Mott · August 10, 2016, 10:57pm

And if you run git pull upstream develop now?

Celina_Arroyo_Gutier · August 10, 2016, 11:00pm

The result is:

root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext# git pull upstream develop --force
De
 * branch            develop    -> FETCH_HEAD
Automezclado erpnext/translations/es.csv
CONFLICTO(contenido): conflicto de fusión en erpnext/translations/es.csv
Eliminando erpnext/templates/pages/edit_profile.py
Eliminando erpnext/templates/pages/edit-profile.html
Eliminando erpnext/templates/includes/product_search_box.html
Eliminando erpnext/templates/includes/product_in_list.html
Eliminando erpnext/templates/includes/product_in_grid.html
Eliminando erpnext/templates/includes/order/order.css
Eliminando erpnext/templates/form_grid/material_request_grid.html
Eliminando erpnext/tasks.py
Eliminando erpnext/support/report/maintenance_schedules/__init__.py
Eliminando erpnext/support/doctype/maintenance_visit/__init__.py
Eliminando erpnext/support/doctype/maintenance_schedule_item/__init__.py
Eliminando erpnext/support/doctype/maintenance_schedule_detail/__init__.py
Eliminando erpnext/support/doctype/maintenance_schedule/__init__.py
Automezclado erpnext/stock/doctype/item/item.json
CONFLICTO(contenido): conflicto de fusión en erpnext/stock/doctype/item/item.json
Eliminando erpnext/setup/setup_wizard/data/sample_home_page.html
Eliminando erpnext/setup/setup_wizard/data/sample_home_page.css
Automezclado erpnext/setup/doctype/uom/uom.json
CONFLICTO(contenido): conflicto de fusión en erpnext/setup/doctype/uom/uom.json
Automezclado erpnext/setup/doctype/item_group/item_group.json
CONFLICTO(contenido): conflicto de fusión en erpnext/setup/doctype/item_group/item_group.json
Eliminando erpnext/setup/doctype/features_setup/features_setup.py
Eliminando erpnext/setup/doctype/features_setup/features_setup.js
Eliminando erpnext/setup/doctype/features_setup/__init__.py
Eliminando erpnext/setup/doctype/features_setup/README.md
Automezclado erpnext/setup/doctype/currency_exchange/currency_exchange.json
CONFLICTO(contenido): conflicto de fusión en erpnext/setup/doctype/currency_exchange/currency_exchange.json
Eliminando erpnext/selling/page/sales_browser/sales_browser.py
Eliminando erpnext/selling/page/sales_browser/sales_browser.json
Eliminando erpnext/selling/page/sales_browser/sales_browser.js
Eliminando erpnext/selling/page/sales_browser/__init__.py
Eliminando erpnext/selling/page/sales_browser/README.md
Automezclado erpnext/schools/doctype/student_group_student/student_group_student.json
Automezclado erpnext/schools/doctype/student_batch_student/student_batch_student.json
Automezclado erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
Automezclado erpnext/schools/doctype/room/room.json
Automezclado erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
Automezclado erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json
Automezclado erpnext/schools/doctype/program/program.json
Automezclado erpnext/schools/doctype/fee_category/fee_category.json
Automezclado erpnext/schools/doctype/assessment_result/assessment_result.json
Automezclado erpnext/schools/doctype/assessment_group/assessment_group.json
Automezclado erpnext/schools/doctype/announcement/announcement.json
Eliminando erpnext/public/js/pos/pos.js
Eliminando erpnext/public/js/feature_setup.js
Automezclado erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
Eliminando erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
Eliminando erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json
Eliminando erpnext/projects/report/daily_time_log_summary/__init__.py
Eliminando erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.py
Eliminando erpnext/projects/doctype/time_log_batch_detail/__init__.py
Eliminando erpnext/projects/doctype/time_log_batch_detail/README.md
Eliminando erpnext/projects/doctype/time_log_batch/time_log_batch_list.js
Eliminando erpnext/projects/doctype/time_log_batch/time_log_batch.py
Eliminando erpnext/projects/doctype/time_log_batch/time_log_batch.js
Eliminando erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
Eliminando erpnext/projects/doctype/time_log_batch/__init__.py
Eliminando erpnext/projects/doctype/time_log_batch/README.md
Eliminando erpnext/projects/doctype/time_log/time_log_list.js
Eliminando erpnext/projects/doctype/time_log/time_log_calendar.js
Eliminando erpnext/projects/doctype/time_log/time_log.py
Eliminando erpnext/projects/doctype/time_log/time_log.js
Eliminando erpnext/projects/doctype/time_log/test_time_log.py
Eliminando erpnext/projects/doctype/time_log/test_records.json
Eliminando erpnext/projects/doctype/time_log/__init__.py
Eliminando erpnext/projects/doctype/time_log/README.md
Automezclado erpnext/modules.txt
CONFLICTO(contenido): conflicto de fusión en erpnext/modules.txt
Eliminando erpnext/manufacturing/page/bom_browser/bom_browser.py
Eliminando erpnext/manufacturing/page/bom_browser/bom_browser.json
Eliminando erpnext/manufacturing/page/bom_browser/bom_browser.js
Eliminando erpnext/manufacturing/page/bom_browser/__init__.py
Automezclado erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json
Automezclado erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
Automezclado erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
Automezclado erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
Automezclado erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
Automezclado erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py
Automezclado erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
Automezclado erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
Automezclado erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
Automezclado erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
Automezclado erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
Automezclado erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
Automezclado erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
Automezclado erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
Automezclado erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
Eliminando erpnext/hr/report/employee_holiday_attendance/__init__.py
Eliminando erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py
Eliminando erpnext/hr/doctype/salary_structure_earning/__init__.py
Eliminando erpnext/hr/doctype/salary_structure_earning/README.md
Eliminando erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py
Eliminando erpnext/hr/doctype/salary_structure_deduction/__init__.py
Eliminando erpnext/hr/doctype/salary_structure_deduction/README.md
Eliminando erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py
Eliminando erpnext/hr/doctype/salary_slip_earning/__init__.py
Eliminando erpnext/hr/doctype/salary_slip_earning/README.md
Eliminando erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py
Eliminando erpnext/hr/doctype/salary_slip_deduction/__init__.py
Eliminando erpnext/hr/doctype/salary_slip_deduction/README.md
Automezclado erpnext/hr/doctype/salary_detail/salary_detail.json
Automezclado erpnext/hr/doctype/salary_component/salary_component.json
Automezclado erpnext/hr/doctype/interest/interest.py
Eliminando erpnext/hr/doctype/earning_type/test_records.json
Eliminando erpnext/hr/doctype/earning_type/test_earning_type.py
Eliminando erpnext/hr/doctype/earning_type/earning_type.py
Eliminando erpnext/hr/doctype/earning_type/__init__.py
Eliminando erpnext/hr/doctype/earning_type/README.md
Eliminando erpnext/hr/doctype/deduction_type/test_records.json
Eliminando erpnext/hr/doctype/deduction_type/test_deduction_type.py
Eliminando erpnext/hr/doctype/deduction_type/deduction_type.py
Eliminando erpnext/hr/doctype/deduction_type/__init__.py
Eliminando erpnext/hr/doctype/deduction_type/README.md
Eliminando erpnext/fixtures/web_form.json
Eliminando erpnext/docs/user/manual/en/using-erpnext/messages.md
Eliminando erpnext/docs/user/manual/en/stock/articles/managing-assets.md
Automezclado erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
Eliminando erpnext/docs/user/manual/en/projects/time-log.md
Eliminando erpnext/docs/user/manual/en/accounts/opening-entry.md
Eliminando erpnext/docs/user/manual/en/accounts/making-payments.md
Automezclado erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
Eliminando erpnext/docs/assets/old_images/erpnext/trial-balance-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/todo-list.png
Eliminando erpnext/docs/assets/old_images/erpnext/todo-close.png
Eliminando erpnext/docs/assets/old_images/erpnext/tags-in-list.png
Eliminando erpnext/docs/assets/old_images/erpnext/pos-remove-item.png
Eliminando erpnext/docs/assets/old_images/erpnext/pos-make-payment.png
Eliminando erpnext/docs/assets/old_images/erpnext/pos-add-item.png
Eliminando erpnext/docs/assets/old_images/erpnext/opening-entry-2.png
Eliminando erpnext/docs/assets/old_images/erpnext/note.png
Eliminando erpnext/docs/assets/old_images/erpnext/note-permission.png
Eliminando erpnext/docs/assets/old_images/erpnext/message-to.png
Eliminando erpnext/docs/assets/old_images/erpnext/message-list.png
Eliminando erpnext/docs/assets/old_images/erpnext/image-temp-opening.png
Eliminando erpnext/docs/assets/old_images/erpnext/forms.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
Eliminando erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-4-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-3.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-2-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/budgeting-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/assigned-to.png
Eliminando erpnext/docs/assets/old_images/erpnext/assigned-to-icon.png
Eliminando erpnext/docs/assets/old_images/erpnext/assign-user.png
Eliminando erpnext/docs/assets/old_images/erpnext/assign-todo.png
Eliminando erpnext/docs/assets/old_images/erpnext/assign-remove.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-5.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-4.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-3.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-2.png
Eliminando erpnext/docs/assets/old_images/erpnext/assets-1.png
Eliminando erpnext/docs/assets/old_images/erpnext/accounting-for-stock-1.png
Automezclado erpnext/crm/doctype/opportunity/opportunity.json
CONFLICTO(contenido): conflicto de fusión en erpnext/crm/doctype/opportunity/opportunity.json
Eliminando erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
Eliminando erpnext/crm/doctype/newsletter_list_subscriber/__init__.py
Eliminando erpnext/crm/doctype/newsletter_list/test_records.json
Eliminando erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
Eliminando erpnext/crm/doctype/newsletter_list/newsletter_list.py
Eliminando erpnext/crm/doctype/newsletter_list/newsletter_list.js
Eliminando erpnext/crm/doctype/newsletter_list/__init__.py
Eliminando erpnext/crm/doctype/newsletter/test_newsletter.py
Eliminando erpnext/crm/doctype/newsletter/newsletter_list.js
Eliminando erpnext/crm/doctype/newsletter/newsletter.py
Eliminando erpnext/crm/doctype/newsletter/newsletter.js
Eliminando erpnext/crm/doctype/newsletter/__init__.py
Automezclado erpnext/crm/doctype/lead/lead.json
CONFLICTO(contenido): conflicto de fusión en erpnext/crm/doctype/lead/lead.json
Automezclado erpnext/config/desktop.py
CONFLICTO(contenido): conflicto de fusión en erpnext/config/desktop.py
Automezclado erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
CONFLICTO(contenido): conflicto de fusión en erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
Automezclado erpnext/buying/doctype/supplier/supplier.json
CONFLICTO(contenido): conflicto de fusión en erpnext/buying/doctype/supplier/supplier.json
Eliminando erpnext/accounts/page/pos/pos_page.html
Eliminando erpnext/accounts/page/financial_analytics/financial_analytics.json
Eliminando erpnext/accounts/page/financial_analytics/financial_analytics.js
Eliminando erpnext/accounts/page/financial_analytics/__init__.py
Eliminando erpnext/accounts/page/financial_analytics/README.md
Eliminando erpnext/accounts/page/accounts_browser/accounts_browser.py
Eliminando erpnext/accounts/page/accounts_browser/accounts_browser.json
Eliminando erpnext/accounts/page/accounts_browser/accounts_browser.js
Eliminando erpnext/accounts/page/accounts_browser/__init__.py
Eliminando erpnext/accounts/page/accounts_browser/README.md
Automezclado erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
CONFLICTO(contenido): conflicto de fusión en erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
Eliminando erpnext/accounts/doctype/payment_tool_detail/__init__.py
Eliminando erpnext/accounts/doctype/payment_tool/test_payment_tool.py
Eliminando erpnext/accounts/doctype/payment_tool/payment_tool.py
Eliminando erpnext/accounts/doctype/payment_tool/payment_tool.js
Eliminando erpnext/accounts/doctype/payment_tool/__init__.py
Automezclado erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
Automezclado erpnext/accounts/doctype/cost_center/cost_center.json
CONFLICTO(contenido): conflicto de fusión en erpnext/accounts/doctype/cost_center/cost_center.json
Automezclado erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py
Automezclado erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
Eliminando erpnext/accounts/doctype/budget_detail/budget_detail.py
Eliminando erpnext/accounts/doctype/budget_detail/__init__.py
Eliminando erpnext/accounts/doctype/budget_detail/README.md
Automezclado erpnext/accounts/doctype/asset/asset.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
Eliminando erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china_small_business.json
Eliminando erpnext/__version__.py
Eliminando ci/my_config.h.patch
Eliminando ci/fix-mariadb.sh
Eliminando CONTRIBUTING.md
Automatic merge failed; fix conflicts and then commit the result.
root@tiba-erpnextproduct:/home/tiba/frappe-bench/apps/erpnext#

Ben_Cornwell_Mott · August 10, 2016, 11:03pm

I’m really not sure how to fix this. I would try deleting any of the files that are CONFLICTO, and retry the same command. I would have thought that git reset --hard and git pull upstream develop --force would have been enough to overwrite, but I guess not.

vjFaLk · August 11, 2016, 6:49am

Let’s start from the beginning

@Ben_Cornwell_Mott I don’t think running git pull upstream develop --force is a good idea

Replace the in the commands below with either develop or master. Pick master if you want to use this for production and pick develop if you plan to develop features, etc

git fetch upstream
git reset --hard 
git clean -fdx
git checkout <branch>
git pull upstream <branch>

Do this for both the folders, erpnext and frappe inside the frappe-bench/apps directory

Celina_Arroyo_Gutier · August 11, 2016, 1:40pm

I tried with the commands but when I run: bench update --upgrade This is the result: