Git error while updating ERPNext


I’m encountering the following error while updating ERPNext, I guess it’s a syncronisation issue with GIT, what can I do with out impacting the bases?

Cannot proceed with update : you have local changes in app “frappe” that are not commited. Here are your choices

  1. Merge the frappe app manually with “git pull” / “git pul --rebase” and fix conflicts.
  2. Temporarily remove your changes with “git stash” or discard them completely with “bench update --reset” or for "individual repositeries “git reset --hard”

when I try a git command I get:
fatal: not a git repositery (or any of the parent directories): ;git

I’m afraid of using bench update --reset as I don’t know what would be the impact


Could you try these?

sudo chown -R ubuntu /home/frappe/.bench
sudo chown -R ubuntu /home/frappe/frappe-bench
cd /home/frappe/.bench
git reset --hard
git pull
cd /home/frappe/frappe-bench
bench update

Is it the .yarn-lock?

Go see differences using git status inside your erpnext or frappe app directory and see what are the changes. If it’s just that yarn thing, don’t worry, go full bench update --reset :slight_smile:

1 Like

If there are lots of changes, you can always stash your changes :slight_smile:

It works perfect
thank you