Cant find bench-repo folder [V6] to [V7]

i am upgrading from version 6 to 7. tried to upgrade on local machine everything went fine no errors the process was success… my server is hosted on digital ocean. i am stuck at the last step with command
git pull
but i cant find bench-repo folder on my server in order execute git pull command

Try at

/.bench

1 Like

thanks the command seems working in this folder but damn with these errors

Updating 47a65b9..6bbf7c9
error: Your local changes to the following files would be overwritten by merge:
	bench/__init__.py
	bench/commands/__init__.py
	bench/commands/make.py
	bench/config/nginx.py
	bench/config/templates/nginx.conf
	bench/patches/__init__.py
	bench/patches/patches.txt
	bench/tests/test_setup_production.py
	bench/utils.py
	playbooks/develop/centos.yml
	playbooks/develop/create_user.yml
	playbooks/develop/includes/setup_mariadb.yml
	playbooks/develop/ubuntu.yml
	playbooks/install.py
	requirements.txt
Please, commit your changes or stash them before you can merge.
Aborting

Installer is seeing changes in that folder. You can either commit or stash those changes if you have an active git account or you can also reset if you know you don’t want those changes. If you’re unsure, take a snapshot in Digital Ocean first so you can revert. Really though you shoulder take snapshots before doing anything server side.

Look up how to stash or commit elsewhere, but if you have not made any changes you want to keep:

git reset --hard HEAD

then run your command again

2 Likes

bench update gives the following error
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
From https://github.com/frappe/frappe
 * branch            master     -> FETCH_HEAD
Updating 92a67b7..6bea61f
error: Your local changes to the following files would be overwritten by merge:
	.travis.yml
	attributions.md
	frappe/__init__.py
	frappe/api.py
	frappe/app.py
	frappe/async.py
	frappe/auth.py
	frappe/boot.py
	frappe/build.py
	frappe/celery_app.py
	frappe/client.py
	frappe/commands.py
	frappe/config/core.py
	frappe/config/desk.py
	frappe/config/desktop.py
	frappe/config/docs.py
	frappe/config/setup.py
	frappe/config/website.py
	frappe/core/doctype/block_module/block_module.json
	frappe/core/doctype/communication/comment.py
	frappe/core/doctype/communication/communication.json
	frappe/core/doctype/communication/communication.py
	frappe/core/doctype/communication/email.py
	frappe/core/doctype/defaultvalue/defaultvalue.json
	frappe/core/doctype/docfield/docfield.json
	frappe/core/doctype/docperm/docperm.json
	frappe/core/doctype/doctype/doctype.js
	frappe/core/doctype/doctype/doctype.json
	frappe/core/doctype/doctype/doctype.py
	frappe/core/doctype/file/file.py
	frappe/core/doctype/file/test_file.py
	frappe/core/doctype/module_def/module_def.json
	frappe/core/doctype/page/page.py
	frappe/core/doctype/page_role/page_role.json
	frappe/core/doctype/patch_log/patch_log.json
	frappe/core/doctype/role/role.js
	frappe/core/doctype/role/role.json
	frappe/core/doctype/scheduler_log/scheduler_log.json
	frappe/core/doctype/system_settings/system_settings.json
	frappe/core/doctype/user/test_user.py
	frappe/core/doctype/user/user.js
	frappe/core/doctype/user/user.json
	frappe/core/doctype/user/user.py
	frappe/core/doctype/user/user_list.js
	frappe/core/doctype/userrole/userrole.json
	frappe/core/doctype/userrole/userrole.py
	frappe/core/doctype/version/version.json
	frappe/core/notifications.py
	frappe/core/page/data_import_tool/data_import_tool.py
	frappe/core/page/data_import_tool/importer.py
	frappe/core/page/desktop/desktop.js
	frappe/core/page/desktop/desktop_list_view.html
	frappe/core/page/desktop/desktop_module_icon.html
	frappe/core/page/modules_setup/includes/module_icons.html
	frappe/core/page/modules_setup/modules_setup.html
	frappe/core/page/modules_setup/modules_setup.js
	frappe/core/page/modules_setup/modules_setup.py
	frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.js
	frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
	frappe/core/report/todo/todo.py
	frappe/custom/doctype/custom_field/custom_field.json
	frappe/custom/doctype/custom_field/custom_field.py
	frappe/custom/doctype/custom_script/custom_script.json
	frappe/custom/doctype/custom_script/custom_script.py
	frappe/custom/doctype/customize_form/customize_form.js
	frappe/custom/doctype/customize_form/customize_form.json
	frappe/custom/doctype/customize_form/customize_form.py
	frappe/custom/doctype/customize_form_field/customize_form_field.json
	frappe/data/Framework.sql
	frappe/data/languages.txt
	frappe/database.py
	frappe/defaults.py
	frappe/desk/calendar.py
	frappe/desk/doctype/desktop_icon/desktop_icon.py
	frappe/desk/doctype/desktop_icon/test_desktop_icon.py
	frappe/desk/doctype/event/event.json
	frappe/desk/doctype/event/event.py
	frappe/desk/doctype/event_role/event_role.json
	frappe/desk/doctype/note/note.json
	frappe/desk/doctype/todo/todo.js
	frappe/desk/doctype/todo/todo.json
	frappe/desk/doctype/todo/todo.py
	frappe/desk/doctype/todo/todo_list.js
	frappe/desk/form/assign_to.py
	frappe/desk/form/linked_with.py
	frappe/desk/form/load.py
	frappe/desk/form/meta.py
	frappe/desk/form/save.py
	frappe/desk/form/utils.py
	frappe/desk/moduleview.py
	frappe/desk/notifications.py
	frappe/desk/page/activity/activity.css
	frappe/desk/page/activity/activity.js
	frappe/desk/page/activity/activity.py
	frappe/desk/page/activity/activity_row.html
	frappe/desk/page/messages/README.md
	frappe/desk/page/messages/__init__.py
	frappe/desk/page/messages/messages.js
	frappe/desk/page/messages/messages.json
	frappe/desk/page/messages/messages.py
	frappe/desk/page/messages/messages_main.html
	frappe/desk/page/messages/messages_row.html
	frappe/desk/page/messages/messages_sidebar.html
	frappe/desk/page/modules/modules.js
	frappe/de
Aborting
Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench', 'console_scripts', 'bench')()
  File "/home/frappe/.bench/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/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 148, 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 90, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream master

git pull error in/apps/erpnext folder`

root@odoo-ubuntu-14:/home/frappe/frappe-bench/apps/erpnext# git pull
Updating 4dd6b7e..8793b82
error: Your local changes to the following files would be overwritten by merge:
	.travis.yml
	CONTRIBUTING.md
	README.md
	erpnext/__init__.py
	erpnext/accounts/doctype/account/account.js
	erpnext/accounts/doctype/account/account.json
	erpnext/accounts/doctype/account/account.py
	erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/cl_cl_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china_small_business.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/gr_l10n_gr_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/hr_l10n_hr_chart_template_rrif.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/it_l10n_it_chart_template_generic.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/ma_l10n_kzc_temp_chart.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/pe_pe_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/pl_pl_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/pt_pt_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/syscohada_syscohada_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json
	erpnext/accounts/doctype/account/chart_of_accounts/unverified/ve_ve_chart_template_amd.json
	erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
	erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
	erpnext/accounts/doctype/acco
Aborting

Well, I don’t know what you’ve changed and how concerned you are with those changes.

So you have the same choices here of committing or stashing to your personal git repo, or running that same reset command in:

/apps/frappe

And

/apps/erpnext

1 Like

ok done as you said … now bench update gives the following error

root@odoo-ubuntu-14:/home/frappe/frappe-bench# bench update --upgrade

This update will remove Celery config and prepare the bench to use Python RQ.
And it will overwrite Procfile and supervisor.conf.
If you don’t know what this means, type Y :wink:

Do you want to continue? [y/N]: y
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 https://github.com/frappe/frappe
 * branch            master     -> FETCH_HEAD
Already up-to-date.
INFO:bench.app:pulling erpnext
error: cannot open .git/FETCH_HEAD: Permission denied

Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench', 'console_scripts', 'bench')()
  File "/home/frappe/.bench/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/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 148, 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 90, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream master
$ cd /home/frappe/.bench/
$ git reset --hard
$ git pull
$ cd ..
$ cd frappe-bench/
$ bench update --upgrade
(if update fails again with "app/frappe" in path of error log)
$ cd /home/frappe/frappe-bench/apps/frappe/
$ git reset --hard
$ git pull
$ cd ../../
$ bench update --upgrade
(if update fails again with "app/erpnext" in path of error log)
$ cd /home/frappe/frappe-bench/apps/erpnext/
$ git reset --hard
$ git pull
$ cd ../../
$ bench update --upgrade

If everything above fails, start fresh with minimal OS and reinstall everyting by running install.py from frappe/bench repo.

@Pirated follow posting guidelines, always put your logs in code block included in ``` marks at start and at the end ``` of code/error logs while submitting next time if log is too large then use pastebin.com/similar service and simply share URL here with your issue and steps for us to reproduce.

1 Like

@yashodhan ok i will start fresh installation of erpnext but my database is v6 how can i import v6 databse into 7 without errors … kindly point me in right direction

What is logs says, share it here? have you tried following?

$ bench retry-upgrade

@yashodhan

root@odoo-ubuntu-14:/home/frappe/frappe-bench# bench retry-upgrade
INFO:bench.app:pulling frappe
remote: Counting objects: 28, done.
remote: Compressing objects: 100% (28/28), done.
remote: Total 28 (delta 5), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (28/28), done.
From https://github.com/frappe/frappe
 * branch            master     -> FETCH_HEAD
   6bea61f..059d656  master     -> upstream/master
Updating 6bea61f..059d656
Fast-forward
 frappe/__init__.py                            |  2 +-
 frappe/commands/site.py                       |  5 +--
 frappe/desk/form/load.py                      |  2 ++
 frappe/installer.py                           |  4 +--
 frappe/model/document.py                      | 29 +++++++++++++++--
 frappe/public/js/frappe/list/doclistview.js   |  2 +-
 frappe/public/js/frappe/ui/sort_selector.html |  2 +-
 frappe/tests/test_form_load.py                | 47 +++++++++++++++++++++++++--
 frappe/website/context.py                     |  3 ++
 frappe/www/print.py                           | 15 +++++++--
 10 files changed, 96 insertions(+), 15 deletions(-)
INFO:bench.app:pulling erpnext
error: cannot open .git/FETCH_HEAD: Permission denied

Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench', 'console_scripts', 'bench')()
  File "/home/frappe/.bench/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/frappe/.bench/bench/commands/update.py", line 106, in retry_upgrade
    pull_all_apps()
  File "/home/frappe/.bench/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/frappe/.bench/bench/utils.py", line 90, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream master

Try this part again and your issue will be resolved.

I have tested it on my build machines, this issue happened to those who pulled updates rapidly before V7 release and also rushed to immediately pull V7 as there was few changes pending with bench being launched as V4, resulted into updates being broken.

tried these steps same error :frowning:
i waited for the stable release … tried the upgrade process few days ago on local machine it was success but when i tried on my server i am having issues …

@yashodhan
can you please help me how do i reinstall cryptography …

Login as root to server first do apt-get to install packages. then switch to frappe user to install cryptography and other related python modules manually.
METHOD 1

# apt-get install build-essential python-dev libffi-dev libssl-dev
$ su - frappe
$ source frappe-bench/env/bin/activate
$ pip install certifi
$ pip install pyopenssl ndg-httpsclient pyasn1
1 Like

I’ve got a fresh install of ERPNEXT 7, haven’t even setup a company or anything. Trying to pull the latest updates and I’m getting “Please, commit your changes or stash them before you can merge”.

I’ve tried all this
cd apps/frappe/
git stash
cd …/…
bench update
cd apps/frappe/
git stash apply
git stash drop

Also ran
cd apps/erpnext/
git stash

But I still getting the above message when trying to update.

Can you show the output from the terminal?

I’d suggest you use git pull --reset hard in those folders (apps/frappe, apps/erpnext)

1 Like
git hard --reset message "HEAD is now at 1892520 Merge branch 'develop' "
sudo bench update

INFO:bench.utils:updating bench
Updating 44013a4..b34b1e1
error: Your local changes to the following files would be overwritten by merge:
    bench/__init__.py
    bench/config/nginx.py
    bench/config/templates/nginx.conf
    bench/patches/v4/update_node.py
    installer/playbooks/install_dependencies.yml
    installer/playbooks/roles/bash_screen_wall/files/screen_wall.sh
    installer/playbooks/roles/bash_screen_wall/tasks/main.yml
    installer/playbooks/roles/dns_caching/handlers/main.yml
    installer/playbooks/roles/dns_caching/tasks/main.yml
    installer/playbooks/roles/epel/README.md
    installer/playbooks/roles/epel/defaults/main.yml
    installer/playbooks/roles/epel/meta/main.yml
    installer/playbooks/roles/epel/tasks/main.yml
    installer/playbooks/roles/fail2ban/defaults/main.yml
    installer/playbooks/roles/fail2ban/handlers/main.yml
    installer/playbooks/roles/fail2ban/tasks/main.yml
    installer/playbooks/roles/fail2ban/templates/nginx-proxy-filter.conf.j2
    installer/playbooks/roles/fail2ban/templates/nginx-proxy-jail.conf.j2
    installer/playbooks/roles/frappe_selinux/files/frappe_selinux.te
    installer/playbooks/roles/frappe_selinux/tasks/main.yml
    installer/playbooks/roles/locale/defaults/main.yml
    installer/playbooks/roles/locale/tasks/main.yml
    installer/playbooks/roles/logwatch/defaults/main.yml
    installer/playbooks/roles/logwatch/tasks/main.yml
    installer/playbooks/roles/logwatch/templates/logwatch.conf.j2
    installer/playbooks/roles/mariadb/README.md
    installer/playbooks/roles/mariadb/defaults/main.yml
    installer/playbooks/roles/mariadb/handlers/main.yml
    installer/playbooks/roles/mariadb/meta/main.yml
    installer/playbooks/roles/mariadb/tasks/centos.yml
    installer/playbooks/roles/mariadb/tasks/main.yml
    installer/playbooks/roles/mariadb/tasks/mysql_secure_installation.yml
    installer/playbooks/roles/mariadb/tasks/ubuntu.yml
    installer/playbooks/roles/mariadb/templates/mariadb_centos.repo.j2
    installer/playbooks/roles/mariadb/templates/mariadb_ubuntu.list.j2
    installer/playbooks/roles/mariadb/templates/my.cnf.j2
    installer/playbooks/roles/mariadb/vars/main.yml
    installer/playbooks/roles/nginx/.travis.yml
    installer/playbooks/roles/nginx/README.md
    installer/playbooks/roles/nginx/defaults/main.yml
    installer/playbooks/roles/nginx/handlers/main.yml
    installer/playbooks/roles/nginx/meta/main.yml
    installer/playbooks/roles/nginx/tasks/main.yml
    installer/playbooks/roles/nginx/tasks/setup-Debian.yml
    installer/playbooks/roles/nginx/tasks/setup-RedHat.yml
    installer/playbooks/roles/nginx/tasks/vhosts.yml
    installer/playbooks/roles/nginx/templates/nginx.conf.j2
    installer/playbooks/roles/nginx/templates/nginx.repo.j2
    installer/playbooks/roles/nginx/templates/vhosts.j2
    installer/playbooks/roles/nginx/tests/inventory
    installer/playbooks/roles/nginx/tests/test.yml
    installer/playbooks/roles/nginx/vars/Debian.yml
    installer/playbooks/roles/nginx/vars/RedHat.yml
    installer/playbooks/roles/ntpd/tasks/main.yml
    installer/playbooks/roles/swap/defaults/main.yml
    installer/playbooks/roles/swap/tasks/main.yml
    installer/playbooks/roles/wkhtmltopdf/defaults/main.yml
    installer/playbooks/roles/wkhtmltopdf/tasks/main.yml
    installer/playbooks/templates/mariadb_config.cnf
    installer/playbooks/templates/nginx.conf
    playbooks/develop/centos.yml
    playbooks/develop/create_user.yml
    playbooks/develop/includes/setup_mariadb.yml
    playbooks/develop/install.yml
    playbooks/develop/ubuntu.yml
    playbooks/production/includes/setup_prod_env.yml
    playbooks/production/templates/default_nginx.j2
    requirements.txt
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
  File "/bin/bench", line 9, in <module>
    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 34, in update
    update_bench()
  File "/home/frappe/.bench/bench/utils.py", line 190, in update_bench
    exec_cmd("git pull", cwd=cwd)
  File "/home/frappe/.bench/bench/utils.py", line 90, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull

Try in the bench-repo folder

1 Like

@iadr3805 Already Addressed here >
https://discuss.erpnext.com/t/solved-cant-find-bench-repo-folder-v6-to-v7/14848/13

1 Like