bench.app.InvalidBranchException: Specified branch of app frappe is not in upstream

Hi All,

I have

erpnext 13.12.1
frappe 13.12.1

on my production machine and while i update i get following error.

Traceback (most recent call last):
File “/usr/local/bin/bench”, line 11, in
load_entry_point(‘bench’, ‘console_scripts’, ‘bench’)()
File “/home/frappe/.bench/bench/cli.py”, line 41, in cli
bench_command()
File “/usr/local/lib/python3.6/dist-packages/click/core.py”, line 764, in call
return self.main(*args, **kwargs)
File “/usr/local/lib/python3.6/dist-packages/click/core.py”, line 717, in main
rv = self.invoke(ctx)
File “/usr/local/lib/python3.6/dist-packages/click/core.py”, line 1137, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python3.6/dist-packages/click/core.py”, line 956, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python3.6/dist-packages/click/core.py”, line 555, in invoke
return callback(*args, **kwargs)
File “/home/frappe/.bench/bench/commands/update.py”, line 25, in update
update(pull=pull, patch=patch, build=build, requirements=requirements, restart_supervisor=restart_supervisor, restart_systemd=restart_systemd, backup=not no_backup, force=force, reset=reset)
File “/home/frappe/.bench/bench/utils.py”, line 176, in update
version_upgrade = is_version_upgrade()
File “/home/frappe/.bench/bench/app.py”, line 283, in is_version_upgrade
raise InvalidBranchException(“Specified branch of app {0} is not in upstream”.format(app))
bench.app.InvalidBranchException: Specified branch of app frappe is not in upstream
frappe@ubuntu:~/frappe-bench$ ls

Looking forward for a proper solution

Thanks

Continuing the discussion from Error while updating the new version erpnext:

This was my mistake it was when i had two branches conflicting with my local to live branch all i had to do is following command

bench switch-to-branch version-13 frappe

after it the bench update would work as is.

Thanks