Hi Team,
Trust everyone’s doing great. Encountered the following error while trying to update to V8
erpnext@ip-172-31-1-158:~/frappe-bench$ bench update --upgrade
INFO:bench.utils:updating bench
INFO:bench.utils:git pull
Already up-to-date.
INFO:bench.utils:./env/bin/pip install Pillow
Requirement already satisfied: Pillow in ./env/lib/python2.7/site-packages
INFO:bench.app:pulling frappe
INFO:bench.utils:git pull upstream master
From https://github.com/frappe/frappe
* branch master -> FETCH_HEAD
Auto-merging frappe/website/doctype/website_sidebar_item/website_sidebar_item.json
Auto-merging frappe/website/doctype/blog_post/templates/blog_post_row.html
Removing frappe/templates/generators/web_form.html
Removing frappe/templates/generators/__init__.py
Removing frappe/public/less/gantt.less
Removing frappe/public/js/lib/tag-it.min.js
Removing frappe/public/js/lib/notify.js
Removing frappe/public/js/lib/jquery/jquery.ui.timepicker-addon.js
Removing frappe/public/js/lib/jquery/jquery.ui.timepicker-addon.css
Removing frappe/public/js/lib/jquery/jquery.ui.sliderAccess.js
Removing frappe/public/js/lib/jquery/jquery.ui.slider.min.js
Removing frappe/public/js/lib/jquery/jquery-ui.min.js
Removing frappe/public/js/lib/jquery/bootstrap_theme/jquery-ui.selected.css
Removing frappe/public/js/lib/gallery/js/blueimp-gallery.js
Removing frappe/public/js/lib/gallery/js/blueimp-gallery-indicator.js
Removing frappe/public/js/lib/gallery/css/blueimp-gallery.css
Removing frappe/public/js/lib/gallery/css/blueimp-gallery-indicator.css
Removing frappe/public/js/lib/daterangepicker.js
Removing frappe/public/js/frappe/views/gantt.js
Removing frappe/public/js/frappe/views/calendar_base.js
Auto-merging frappe/public/js/frappe/views/calendar/calendar.js
Removing frappe/public/js/frappe/ui/editor.js
Removing frappe/public/js/frappe/ui/editor.html
Removing frappe/public/js/frappe/list/listview.js
Removing frappe/public/js/frappe/list/imageview.js
Removing frappe/public/js/frappe/list/image_view_item_row.html
Removing frappe/public/js/frappe/list/image_view_item_main_head.html
Removing frappe/public/js/frappe/list/doclistview.js
Removing frappe/public/js/frappe/list/blueimp-gallery.html
Removing frappe/public/css/tag-it.css
Removing frappe/public/css/gantt.css
Removing frappe/public/css/daterangepicker.css
Removing frappe/patches/v7_0/setup_list_settings.py
Removing frappe/model/utils/list_settings.py
Auto-merging frappe/integrations/oauth2.py
Auto-merging frappe/integrations/doctype/oauth_client/oauth_client.json
Auto-merging frappe/integrations/doctype/oauth_bearer_token/oauth_bearer_token.json
Auto-merging frappe/integrations/doctype/oauth_authorization_code/oauth_authorization_code.json
Auto-merging frappe/integrations/doctype/integration_request/integration_request.json
Removing frappe/integration_broker/integration_controller.py
Removing frappe/integration_broker/doctype/oauth_client/__init__.py
Removing frappe/integration_broker/doctype/oauth_bearer_token/__init__.py
Removing frappe/integration_broker/doctype/oauth_authorization_code/__init__.py
Removing frappe/integration_broker/doctype/integration_service_parameter/__init__.py
Removing frappe/integration_broker/doctype/integration_service/test_integration_service.py
Removing frappe/integration_broker/doctype/integration_service/integration_service.py
Removing frappe/integration_broker/doctype/integration_service/integration_service.js
Removing frappe/integration_broker/doctype/integration_service/__init__.py
Removing frappe/integration_broker/doctype/integration_request/__init__.py
Removing frappe/integration_broker/doctype/__init__.py
Removing frappe/integration_broker/__init__.py
Removing frappe/desk/doctype/event_role/event_role.py
Removing frappe/desk/doctype/event_role/event_role.json
Removing frappe/desk/doctype/event_role/__init__.py
Removing frappe/desk/doctype/event_role/README.md
Removing frappe/data/app_listing/poll.json
Removing frappe/data/app_listing/knowledge_base.json
Removing frappe/core/doctype/userrole/userrole.json
Removing frappe/core/doctype/userrole/__init__.py
Removing frappe/core/doctype/userrole/README.md
Removing frappe/core/doctype/page_role/page_role.py
Removing frappe/core/doctype/page_role/__init__.py
Removing frappe/core/doctype/page_role/README.md
Auto-merging frappe/core/doctype/has_role/has_role.py
Auto-merging frappe/core/doctype/has_role/has_role.json
Auto-merging frappe/core/doctype/custom_role/custom_role.json
Auto-merging frappe/core/doctype/custom_docperm/custom_docperm.py
Auto-merging frappe/core/doctype/communication/communication.json
CONFLICT (content): Merge conflict in frappe/core/doctype/communication/communication.json
Auto-merging frappe/boot.py
Automatic merge failed; fix conflicts and then commit the result.
Traceback (most recent call last):
File "/usr/local/bin/bench", line 9, in <module>
load_entry_point('bench==0.92', 'console_scripts', 'bench')()
File "/home/erpnext/bench-repo/bench/cli.py", line 40, in cli
bench_command()
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 700, in __call__
return self.main(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 680, in main
rv = self.invoke(ctx)
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 1027, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 873, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 508, in invoke
return callback(*args, **kwargs)
File "/home/erpnext/bench-repo/bench/commands/update.py", line 62, in update
_update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force, reset=reset)
File "/home/erpnext/bench-repo/bench/commands/update.py", line 78, in _update
pull_all_apps(bench_path=bench_path, reset=reset)
File "/home/erpnext/bench-repo/bench/app.py", line 170, in pull_all_apps
remote=remote, branch=get_current_branch(app, bench_path=bench_path)), cwd=app_dir)
File "/home/erpnext/bench-repo/bench/utils.py", line 130, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull upstream master
erpnext@ip-172-31-1-158:~/frappe-bench$
Kindly assist
Thanks