Bench update error may be related to android

imllc · October 26, 2016, 11:47pm

Went to do a bench update in hopes of

fixing android app problem

correct the mail account issue where the inbound gets deselected

long story short I cannot run bench update despite trying to run all of the git reset and chown commands listed in other post here are the error:

$ sudo bench update
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
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript

branch master → FETCH_HEAD
Already up-to-date.
INFO:bench.app:pulling erpnext
From GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP)
branch master → 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: empty ident name (for frappe@moneta.c.striking-shift-146713.internal) not allowed
Traceback (most recent call last):
File “/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/lib64/python2.7/site-packages/click/core.py”, line 716, in call
return self.main(*args, **kwargs)
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 696, in main
rv = self.invoke(ctx)
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 1060, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 889, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/lib64/python2.7/site-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 140, 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 127, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull upstream master

netchampfaris · October 27, 2016, 5:58am

Check which branch is checked out on erpnext.

imllc · October 27, 2016, 11:56am

I am not familiar with git hub as far as I know I have just checked whatever is default using bench update.

imllc · October 27, 2016, 12:50pm

[azadmin@moneta .bench]$ su frappe
Password:
[frappe@moneta .bench]$ git reset --hard
HEAD is now at a8312f6 Merge pull request #330 from vjFaLk/ssh-port
[frappe@moneta .bench]$ git pull
Already up-to-date.
[frappe@moneta .bench]$ cd /home/frappe/frappe-bench
[frappe@moneta frappe-bench]$ bench update
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
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript

branch master → FETCH_HEAD
Already up-to-date.
INFO:bench.app:pulling erpnext
From GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP)
branch master → FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
erpnext/init.py
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
erpnext/accounts/doctype/asset_category/asset_category.js
erpnext/accounts/doctype/asset_category_account/asset_category_account.json
erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
erpnext/accounts/doctype/cost_center/cost_center_tree.js
erpnext/accounts/doctype/gl_entry/gl_entry.py
erpnext/accounts/doctype/journal_entry/journal_entry.js
erpnext/accounts/doctype/journal_entry/journal_entry.json
erpnext/accounts/doctype/journal_entry/journal_entry.py
erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
erpnext/accounts/doctype/payment_entry/payment_entry.js
erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
erpnext/accounts/doctype/payment_request/payment_request.json
erpnext/accounts/doctype/payment_request/payment_request.py
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
erpnext/accounts/doctype/sales_invoice/pos.py
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
erpnext/accounts/page/pos/pos.js
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
erpnext/accounts/report/balance_sheet/balance_sheet.py
erpnext/accounts/report/cash_flow/cash_flow.js
erpnext/accounts/report/cash_flow/cash_flow.py
erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
erpnext/accounts/report/financial_statements.py
erpnext/accounts/report/general_ledger/general_ledger.js
erpnext/accounts/report/general_ledger/general_ledger.py
erpnext/accounts/report/gross_profit/gross_profit.py
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
erpnext/accounts/report/trial_balance/trial_balance.js
erpnext/accounts/report/trial_balance/trial_balance.py
erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
erpnext/accounts/utils.py
erpnext/buying/doctype/purchase_common/purchase_common.js
erpnext/buying/doctype/purchase_order/purchase_order.json
erpnext/buying/doctype/purchase_order/purchase_order.py
erpnext/buying/doctype/purchase_order/test_purchase_order.py
erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
erpnext/buying/doctype/request_for_quotation/request_for_quotation
Aborting
Traceback (most recent call last):
File “/usr/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/lib64/python2.7/site-packages/click/core.py”, line 716, in call
return self.main(*args, **kwargs)
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 696, in main
rv = self.invoke(ctx)
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 1060, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 889, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/lib64/python2.7/site-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 140, 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 127, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull upstream master
[frappe@moneta frappe-bench]$

makarand_b · October 27, 2016, 1:06pm

add and commit your local changes then try bench update

imllc · October 27, 2016, 2:07pm

what is the commands you recommend I am very new to git

makarand_b · October 27, 2016, 2:22pm

@imllc,

You will need to use the git add and git commit -m"commit msg" commands.
for more details please check https://try.github.io & https://git-scm.com/docs/gittutorial,

Thanks, Makarand

imllc · October 27, 2016, 2:33pm

did that still error:

[frappe@moneta apps]$ ls
erpnext frappe paypal_integration
[frappe@moneta apps]$ cd erpnext
[frappe@moneta erpnext]$ git add
Nothing specified, nothing added.
Maybe you wanted to say ‘git add .’?
[frappe@moneta erpnext]$ git add .
[frappe@moneta erpnext]$ cd …
[frappe@moneta apps]$ cd frappe
[frappe@moneta frappe]$ git add .
[frappe@moneta frappe]$ cd …
[frappe@moneta apps]$ cd paypal_integration
[frappe@moneta paypal_integration]$ git add .
[frappe@moneta paypal_integration]$ git commit -m"commit msg"

On branch master

nothing to commit, working directory clean
[frappe@moneta paypal_integration]$ cd …
[frappe@moneta apps]$ cd frappe
[frappe@moneta frappe]$ git commit -m"commit msg"

On branch master

nothing to commit, working directory clean
[frappe@moneta frappe]$ cd …
[frappe@moneta apps]$ cd erpnext
[frappe@moneta erpnext]$ git commit -m"commit msg"
[master b46bd60] commit msg
Committer: azadmin frappe@moneta.c.striking-shift-146713.internal
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

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

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

524 files changed, 106408 insertions(+), 46277 deletions(-)
create mode 100644 erpnext/accounts/doctype/salary_component_account/init.py
create mode 100644 erpnext/accounts/doctype/salary_component_account/salary_component_account.json
create mode 100644 erpnext/accounts/doctype/salary_component_account/salary_component_account.py
rewrite erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json (64%)
rewrite erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json (67%)
create mode 100644 erpnext/accounts/report/profitability_analysis/init.py
create mode 100644 erpnext/accounts/report/profitability_analysis/profitability_analysis.js
create mode 100644 erpnext/accounts/report/profitability_analysis/profitability_analysis.json
create mode 100644 erpnext/accounts/report/profitability_analysis/profitability_analysis.py
rewrite erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json (65%)
rewrite erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json (61%)
create mode 100644 erpnext/change_log/v7/v7_1_0.md
rewrite erpnext/crm/doctype/lead/lead.json (95%)
create mode 100644 erpnext/demo/data/course.json
create mode 100644 erpnext/demo/data/department.json
create mode 100644 erpnext/demo/data/instructor.json
create mode 100644 erpnext/demo/data/item_schools.json
create mode 100644 erpnext/demo/data/program.json
create mode 100644 erpnext/demo/data/random_student_data.json
create mode 100644 erpnext/demo/data/room.json
create mode 100644 erpnext/demo/setup/init.py
create mode 100644 erpnext/demo/setup/education.py
create mode 100644 erpnext/demo/setup/manufacture.py
rename erpnext/demo/{ => setup}/setup_data.py (71%)
create mode 100644 erpnext/demo/user/schools.py
create mode 100644 erpnext/docs/assets/img/accounts/pos-sales-invoice.png
create mode 100644 erpnext/docs/assets/img/fleet-management/init.py
create mode 100644 erpnext/docs/assets/img/fleet-management/expense-claim-3.1.png
create mode 100644 erpnext/docs/assets/img/fleet-management/expense-claim-3.2.png
create mode 100644 erpnext/docs/assets/img/fleet-management/vehicle-1.1.png
create mode 100644 erpnext/docs/assets/img/fleet-management/vehicle-1.2.png
create mode 100644 erpnext/docs/assets/img/fleet-management/vehicle-1.3.png
create mode 100644 erpnext/docs/assets/img/fleet-management/vehicle-expenses.png
create mode 100644 erpnext/docs/assets/img/fleet-management/vehicle-log-2.1.png
create mode 100644 erpnext/docs/assets/img/fleet-management/vehicle-log-2.2.png
create mode 100644 erpnext/docs/assets/img/human-resources/bank-entry.png
create mode 100644 erpnext/docs/assets/img/human-resources/condition-amount.png
create mode 100644 erpnext/docs/assets/img/human-resources/condition-formula.png
rewrite erpnext/docs/assets/img/human-resources/process-payroll.png (97%)
create mode 100644 erpnext/docs/assets/img/human-resources/salary-structure-account.png
rewrite erpnext/docs/assets/img/human-resources/salary-structure.png (94%)
create mode 100644 erpnext/docs/assets/img/human-resources/salary-timesheet.png
create mode 100644 erpnext/docs/assets/img/project/percent-complete-calc.png
create mode 100644 erpnext/docs/assets/img/project/percent-complete-formula.png
create mode 100644 erpnext/docs/assets/img/project/project-percent-complete.png
create mode 100644 erpnext/docs/assets/img/project/task-weights.png
create mode 100644 erpnext/docs/assets/img/project/tasks.png
create mode 100644 erpnext/docs/assets/img/schools/admission/init.py
rename erpnext/docs/assets/img/schools/{student => admission}/program-enrollment.png (100%)
rename erpnext/docs/assets/img/schools/{student => admission}/student-applicant-enroll.png (100%)
create mode 100644 erpnext/docs/assets/img/schools/admission/student-applicant.png
create mode 100644 erpnext/docs/assets/img/schools/module.png
delete mode 100755 erpnext/docs/assets/img/schools/student/student-applicant.png
create mode 100644 erpnext/docs/assets/img/schools/student/student-batch.png
rewrite erpnext/docs/assets/img/schools/student/student-group.png (97%)
create mode 100644 erpnext/docs/assets/img/schools/student/student-log.png
delete mode 100755 erpnext/docs/assets/img/schools/student/student-section.png
rewrite erpnext/docs/assets/img/schools/student/student.png (97%)
create mode 100644 erpnext/docs/assets/img/setup/email/auto-email-1.png
create mode 100644 erpnext/docs/assets/img/setup/email/auto-email-2.png
create mode 100644 erpnext/docs/assets/img/setup/email/auto-email-3.png
create mode 100644 erpnext/docs/assets/img/setup/email/auto-email-4.png
create mode 100644 erpnext/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md
create mode 100644 erpnext/docs/user/manual/en/fleet_management/init.py
create mode 100644 erpnext/docs/user/manual/en/fleet_management/index.md
create mode 100644 erpnext/docs/user/manual/en/fleet_management/index.txt
create mode 100644 erpnext/docs/user/manual/en/schools/admission/init.py
create mode 100644 erpnext/docs/user/manual/en/schools/admission/index.md
create mode 100644 erpnext/docs/user/manual/en/schools/admission/index.txt
rename erpnext/docs/user/manual/en/schools/{student => admission}/program-enrollment.md (72%)
rename erpnext/docs/user/manual/en/schools/{student => admission}/student-applicant.md (91%)
create mode 100644 erpnext/docs/user/manual/en/schools/student/student-batch.md
create mode 100644 erpnext/docs/user/manual/en/schools/student/student-log.md
create mode 100644 erpnext/docs/user/manual/en/setting-up/email/email-reports.md
create mode 100644 erpnext/fleet_management/init.py
create mode 100644 erpnext/fleet_management/doctype/init.py
create mode 100644 erpnext/fleet_management/doctype/vehicle/init.py
create mode 100644 erpnext/fleet_management/doctype/vehicle/test_vehicle.py
create mode 100644 erpnext/fleet_management/doctype/vehicle/vehicle.js
create mode 100644 erpnext/fleet_management/doctype/vehicle/vehicle.json
create mode 100644 erpnext/fleet_management/doctype/vehicle/vehicle.py
create mode 100644 erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py
create mode 100644 erpnext/fleet_management/doctype/vehicle_log/init.py
create mode 100644 erpnext/fleet_management/doctype/vehicle_log/test_vehicle_log.py
create mode 100644 erpnext/fleet_management/doctype/vehicle_log/vehicle_log.js
create mode 100644 erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
create mode 100644 erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py
create mode 100644 erpnext/fleet_management/doctype/vehicle_service/init.py
create mode 100644 erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
create mode 100644 erpnext/fleet_management/doctype/vehicle_service/vehicle_service.py
create mode 100644 erpnext/fleet_management/report/init.py
create mode 100644 erpnext/fleet_management/report/vehicle_expenses/init.py
create mode 100644 erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.js
create mode 100644 erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.json
create mode 100644 erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py
create mode 100644 erpnext/hr/doctype/process_payroll/test_process_payroll.py
rewrite erpnext/hr/doctype/salary_structure/salary_structure.py (68%)
delete mode 100755 erpnext/hr/doctype/salary_structure/test_records.json
create mode 100644 erpnext/hr/doctype/salary_structure_employee/init.py
create mode 100644 erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
create mode 100644 erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.py
rewrite erpnext/hr/print_format/salary_slip_based_on_timesheet/salary_slip_based_on_timesheet.json (83%)
rewrite erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json (84%)
create mode 100644 erpnext/hr/report/monthly_salary_register/monthly_salary_register.html
create mode 100644 erpnext/hr/web_form/init.py
create mode 100644 erpnext/hr/web_form/job_application/init.py
create mode 100644 erpnext/hr/web_form/job_application/job_application.js
create mode 100644 erpnext/hr/web_form/job_application/job_application.json
create mode 100644 erpnext/hr/web_form/job_application/job_application.py
create mode 100644 erpnext/manufacturing/doctype/bom_scrap_item/init.py
create mode 100644 erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
create mode 100644 erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.py
create mode 100644 erpnext/manufacturing/doctype/production_planning_tool/test_production_planning_tool.py
create mode 100644 erpnext/manufacturing/doctype/production_planning_tool/test_records.json
create mode 100644 erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
create mode 100644 erpnext/patches/v7_0/update_conversion_factor_in_supplier_quotation_item.py
create mode 100644 erpnext/patches/v7_1/init.py
create mode 100644 erpnext/patches/v7_1/add_field_for_task_dependent.py
create mode 100644 erpnext/patches/v7_1/fix_link_for_customer_from_lead.py
create mode 100644 erpnext/patches/v7_1/move_sales_invoice_from_parent_to_child_timesheet.py
create mode 100644 erpnext/patches/v7_1/rename_field_timesheet.py
create mode 100644 erpnext/patches/v7_1/set_prefered_contact_email.py
create mode 100644 erpnext/patches/v7_1/set_student_guardian.py
create mode 100644 erpnext/patches/v7_1/set_total_amount_currency_in_je.py
create mode 100644 erpnext/patches/v7_1/update_component_type.py
create mode 100644 erpnext/patches/v7_1/update_lead_source.py
create mode 100644 erpnext/patches/v7_1/update_portal_roles.py
create mode 100644 erpnext/patches/v7_1/update_total_billing_hours.py
create mode 100644 erpnext/public/js/help_links.js
rewrite erpnext/schools/doctype/academic_term/test_records.json (98%)
rewrite erpnext/schools/doctype/assessment/assessment.py (75%)
create mode 100644 erpnext/schools/doctype/grade_interval/init.py
create mode 100644 erpnext/schools/doctype/grade_interval/grade_interval.json
create mode 100644 erpnext/schools/doctype/grade_interval/grade_interval.py
create mode 100644 erpnext/schools/doctype/grading_structure/init.py
create mode 100644 erpnext/schools/doctype/grading_structure/grading_structure.js
create mode 100644 erpnext/schools/doctype/grading_structure/grading_structure.json
create mode 100644 erpnext/schools/doctype/grading_structure/grading_structure.py
create mode 100644 erpnext/schools/doctype/grading_structure/test_grading_structure.py
create mode 100644 erpnext/schools/doctype/student_admission/init.py
create mode 100644 erpnext/schools/doctype/student_admission/student_admission.js
create mode 100644 erpnext/schools/doctype/student_admission/student_admission.json
create mode 100644 erpnext/schools/doctype/student_admission/student_admission.py
create mode 100644 erpnext/schools/doctype/student_admission/test_student_admission.py
create mode 100644 erpnext/schools/doctype/student_category/init.py
create mode 100644 erpnext/schools/doctype/student_category/student_category.js
create mode 100644 erpnext/schools/doctype/student_category/student_category.json
create mode 100644 erpnext/schools/doctype/student_category/student_category.py
create mode 100644 erpnext/schools/doctype/student_category/test_student_category.py
create mode 100644 erpnext/schools/doctype/student_guardian/init.py
create mode 100644 erpnext/schools/doctype/student_guardian/student_guardian.json
create mode 100644 erpnext/schools/doctype/student_guardian/student_guardian.py
create mode 100644 erpnext/schools/doctype/student_sibling/init.py
create mode 100644 erpnext/schools/doctype/student_sibling/student_sibling.json
create mode 100644 erpnext/schools/doctype/student_sibling/student_sibling.py
create mode 100644 erpnext/schools/doctype/student_siblings/init.py
create mode 100644 erpnext/schools/doctype/student_siblings/student_siblings.json
create mode 100644 erpnext/schools/doctype/student_siblings/student_siblings.py
create mode 100644 erpnext/schools/web_form/student_applicant/init.py
create mode 100644 erpnext/schools/web_form/student_applicant/student_applicant.js
create mode 100644 erpnext/schools/web_form/student_applicant/student_applicant.json
create mode 100644 erpnext/schools/web_form/student_applicant/student_applicant.py
rewrite erpnext/selling/doctype/customer/customer.js (60%)
create mode 100644 erpnext/selling/doctype/lead_source/init.py
create mode 100644 erpnext/selling/doctype/lead_source/lead_source.js
create mode 100644 erpnext/selling/doctype/lead_source/lead_source.json
create mode 100644 erpnext/selling/doctype/lead_source/lead_source.py
create mode 100644 erpnext/selling/doctype/lead_source/test_lead_source.py
create mode 100644 erpnext/selling/doctype/selling_settings/selling_settings.js
create mode 100644 erpnext/setup/setup_wizard/data/country_wise_tax.json
rewrite erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json (75%)
create mode 100644 erpnext/templates/generators/student_admission.html
create mode 100644 erpnext/translations/am.csv
rewrite erpnext/translations/da-DK.csv (99%)
create mode 100644 erpnext/translations/en-US.csv
create mode 100644 erpnext/translations/en.csv
create mode 100644 erpnext/translations/es-AR.csv
create mode 100644 erpnext/translations/es-CL.csv
create mode 100644 erpnext/translations/es-GT.csv
create mode 100644 erpnext/translations/es-MX.csv
create mode 100644 erpnext/translations/es-NI.csv
create mode 100644 erpnext/translations/fr-CA.csv
create mode 100644 erpnext/translations/ku.csv
create mode 100644 erpnext/translations/lo.csv
create mode 100644 erpnext/translations/lt.csv
create mode 100644 erpnext/translations/ps.csv
create mode 100644 erpnext/translations/rw.csv
create mode 100644 erpnext/translations/si.csv
create mode 100644 erpnext/translations/sr-SP.csv
rename erpnext/translations/{zh-cn.csv => zh.csv} (73%)
rewrite license.txt (91%)
delete mode 100755 test_sites/languages.txt
[frappe@moneta erpnext]$ cd …
[frappe@moneta apps]$ cd …
[frappe@moneta frappe-bench]$ bench update
INFO:bench.utils:updating bench
Already up-to-date.
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 17 (delta 3), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (17/17), done.
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript
563e061…9f93076 master → upstream/master
37614ed…7c4f40b develop → upstream/develop
8cd4702…9f93076 hotfix → upstream/hotfix

[new tag] v7.1.2 → v7.1.2
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 563e061…9f93076
Fast-forward
frappe/init.py | 2 ±
frappe/public/css/desk.css | 3 +++
frappe/public/css/website.css | 3 +++
frappe/public/js/frappe/views/treeview.js | 28 ++++++++±------------------
frappe/public/less/desk.less | 3 +++
5 files changed, 19 insertions(+), 20 deletions(-)
INFO:bench.app:pulling erpnext
remote: Counting objects: 29, done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 29 (delta 5), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (29/29), done.
From GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP)
branch master → FETCH_HEAD
Auto-merging erpnext/stock/doctype/warehouse/warehouse_tree.js
Auto-merging erpnext/setup/doctype/sales_person/sales_person_tree.js
Auto-merging erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
Auto-merging erpnext/accounts/doctype/cost_center/cost_center_tree.js
CONFLICT (content): Merge conflict in erpnext/accounts/doctype/cost_center/cost_center_tree.js
Auto-merging erpnext/accounts/doctype/account/account_tree.js
Auto-merging erpnext/init.py
CONFLICT (content): Merge conflict in erpnext/init.py
Automatic merge failed; fix conflicts and then commit the result.
Traceback (most recent call last):
File “/usr/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/lib64/python2.7/site-packages/click/core.py”, line 716, in call
return self.main(*args, **kwargs)
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 696, in main
rv = self.invoke(ctx)
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 1060, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/lib64/python2.7/site-packages/click/core.py”, line 889, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/lib64/python2.7/site-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 140, 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 127, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull upstream master
[frappe@moneta frappe-bench]$

imllc · October 28, 2016, 3:00pm

still having problems and have not made any changes that should have caused this to get out of synch what specific commands do I need to run to resolve I have tried what’s was suggested?