Update Error - CalledProcessError: Command 'git pull upstream master' returned non- zero exit status 1

frappe-bench$ bench update
remote: Counting objects: 349, done.
remote: Compressing objects: 100% (63/63), done.
remote: Total 349 (delta 88), reused 42 (delta 42), pack-reused 244
Receiving objects: 100% (349/349), 57.60 KiB | 0 bytes/s, done.
Resolving deltas: 100% (230/230), done.
From https://github.com/frappe/bench
9c72d0a…6b5c9db master -> origin/master

  • [new branch] pdvyas-patch-1 -> origin/pdvyas-patch-1
  • [new branch] v5.0 -> origin/v5.0
    Updating 9c72d0a…6b5c9db
    Fast-forward
    README.md | 12 +±
    bench/app.py | 100 ++++++++++++++++++++±-
    bench/cli.py | 168 +++++++++++++++++++++++++++++++±-----
    bench/config.py | 36 +++++±-
    bench/migrate_to_v5.py | 15 +±-
    bench/production_setup.py | 4 ±
    bench/release.py | 32 +++±—
    bench/templates/nginx.conf | 5 ±
    bench/templates/redis.conf | 72 ++++++++++++++++
    bench/templates/supervisor.conf | 13 +++
    bench/utils.py | 141 +++++++++++++++++++++++++++±—
    completion.sh | 30 +++++++
    install_scripts/erpnext-apps.json | 4 -
    install_scripts/setup_frappe.sh | 97 ++++++++++++++++±----
    14 files changed, 617 insertions(+), 112 deletions(-)
    create mode 100644 bench/templates/redis.conf
    create mode 100644 completion.sh
    remote: Counting objects: 9983, done.
    remote: Compressing objects: 100% (2046/2046), done.
    remote: Total 9983 (delta 2372), reused 1003 (delta 977), pack-reused 6960
    Receiving objects: 100% (9983/9983), 8.37 MiB | 2.91 MiB/s, done.
    Resolving deltas: 100% (7285/7285), done.
    From https://github.com/frappe/frappe
    c35a01b…b77510c master -> upstream/master
    08307d8…5429e1f develop -> upstream/develop
  • [new branch] v4.x.x -> upstream/v4.x.x
  • [new tag] v4.14.1 -> v4.14.1
  • [new tag] v4.6.1 -> v4.6.1
  • [new tag] v4.10.0 -> v4.10.0
  • [new tag] v4.10.1 -> v4.10.1
  • [new tag] v4.10.2 -> v4.10.2
  • [new tag] v4.11.0 -> v4.11.0
  • [new tag] v4.11.1 -> v4.11.1
  • [new tag] v4.11.2 -> v4.11.2
  • [new tag] v4.11.3 -> v4.11.3
  • [new tag] v4.11.4 -> v4.11.4
  • [new tag] v4.12.0 -> v4.12.0
  • [new tag] v4.12.1 -> v4.12.1
  • [new tag] v4.12.2 -> v4.12.2
  • [new tag] v4.13.0 -> v4.13.0
  • [new tag] v4.13.1 -> v4.13.1
  • [new tag] v4.13.2 -> v4.13.2
  • [new tag] v4.13.3 -> v4.13.3
  • [new tag] v4.13.4 -> v4.13.4
  • [new tag] v4.13.5 -> v4.13.5
  • [new tag] v4.13.6 -> v4.13.6
  • [new tag] v4.14.0 -> v4.14.0
  • [new tag] v4.7.0 -> v4.7.0
  • [new tag] v4.7.1 -> v4.7.1
  • [new tag] v4.8.0 -> v4.8.0
  • [new tag] v4.9.0 -> v4.9.0
  • [new tag] v4.9.1 -> v4.9.1
  • [new tag] v4.9.2 -> v4.9.2
  • [new tag] v4.9.3 -> v4.9.3
    remote: Counting objects: 1779, done.
    remote: Compressing objects: 100% (676/676), done.
    remote: Total 1779 (delta 630), reused 258 (delta 258), pack-reused 845
    Receiving objects: 100% (1779/1779), 2.55 MiB | 1.56 MiB/s, done.
    Resolving deltas: 100% (1081/1081), done.
    From https://github.com/frappe/erpnext
  • branch master -> FETCH_HEAD
    7c82d61…05f8b6d master -> upstream/master
    Updating 7c82d61…05f8b6d
    error: Your local changes to the following files would be overwritten by merge:
    erpnext/selling/doctype/opportunity/opportunity.js
    Please, commit your changes or stash them before you can merge.
    Aborting
    Error: None
    Traceback (most recent call last):
    File “/usr/local/bin/bench”, line 9, in
    load_entry_point(‘bench==0.1’, ‘console_scripts’, ‘bench’)()
    File “/home/erpnext/bench-repo/bench/cli.py”, line 55, in cli
    bench()
    File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 610, in ca ll
    return self.main(*args, **kwargs)
    File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 590, in main
    rv = self.invoke(ctx)
    File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 936, in invo ke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
    File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 782, in invo ke
    return ctx.invoke(self.callback, **ctx.params)
    File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 416, in invo ke
    return callback(*args, **kwargs)
    File “/home/erpnext/bench-repo/bench/cli.py”, line 233, in update
    pull_all_apps()
    File “/home/erpnext/bench-repo/bench/app.py”, line 91, in pull_all_apps
    exec_cmd(“git pull {rebase} upstream {branch}”.format(rebase=rebase, branch= get_current_branch(app_dir)), cwd=app_dir)
    File “/home/erpnext/bench-repo/bench/utils.py”, line 72, in exec_cmd
    subprocess.check_call(cmd, cwd=cwd, shell=True)
    File “/usr/lib/python2.7/subprocess.py”, line 540, in check_call
    raise CalledProcessError(retcode, cmd)
    subprocess.CalledProcessError: Command ‘git pull upstream master’ returned non- zero exit status 1
    erpnext@erpnext:~/frappe-bench$

Please read the trace before posting!

@pdvyas reverse the trace!