…and I am still getting ‘Internal Server Error’.
You made lots of changes:
error: Your local changes to the following files would be overwritten by merge:
README. md
bench/cli.py
bench/commands/install.py
bench/commands/setup.py
Please, commit your changes or stash them before you can merge.
You have permission problems:
fatal: Unable to create ‘/home/frappe/frappe-bench/apps/erpnext/.git/ORIG_HEAD.lock’: Permission denied
The best way is to find your last stable backup , then reinstall → restore and step-by-step made the changes to avoid trouble.
Hope this helps.