Error while updating ERPNext to version 7

Install / Update
1

Hi Everyone,
I have some customization in my app and while updating the ERPNext to version 7 and I got below error messages.

Updating 4dd6b7e..ec6267e
error: Your local changes to the following files would be overwritten by merge:
	erpnext/manufacturing/doctype/bom/bom.js
	erpnext/manufacturing/page/bom_browser/bom_browser.js
	erpnext/manufacturing/page/bom_browser/bom_browser.py
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench==3.0.0', 'console_scripts', 'bench')()
  File "/home/vishnu/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/vishnu/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/vishnu/bench-repo/bench/commands/update.py", line 76, in _update
    pull_all_apps(bench_path=bench_path)
  File "/home/vishnu/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/vishnu/bench-repo/bench/utils.py", line 127, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream master

I appreciate if anyone can help me to find the correct solution for the same.

Regards
Ruchin Sharma

2

Try running these commands
cd apps/frappe/
git stash
cd …/…
bench update
cd apps/frappe/
git stash apply
git stash drop

3

@Muthu doing the same dear.

Thanks for your quick response

Regards
Ruchin Sharma

1 Like
4

Hi @ruchin78 Also have a note ,

If you want to commit do the following:

git add -A
git commit -a -m'YOUR OWN MESSAGE'
If you want to stash them

git stash

Thanks