What is this? Your local changes to the following files would be overwritten by merge:

[cpurbaugh]

There’s a conflict with your code and the repository’s code.

Try this:

Bench Update Error New - bench.utils.CommandFailedError: git pull

Hi it seems you have some changes in your .bench folder, unless you meant to make those changes, you will have to run the following commands to fix this : cd ~/.bench git reset --hard git pull Also you should not run bench update as with sudo.