Hi all,
getting trouble on bench update in production env, seems yarn.lock need to be added to .gitignore:
$ bench update
INFO:bench.utils:updating bench
INFO:bench.utils:git pull
Already up-to-date.
INFO:bench.utils:./env/bin/pip install Pillow
Requirement already satisfied: Pillow in ./env/lib/python2.7/site-packages
Requirement already satisfied: olefile in ./env/lib/python2.7/site-packages (from Pillow)
Cannot proceed with update: You have local changes in app "frappe" that are not committed.
Here are your choices:
1. Merge the frappe app manually with "git pull" / "git pull --rebase" and fix conflicts.
1. Temporarily remove your changes with "git stash" or discard them completely
with "bench update --reset" or for individual repositries "git reset --hard"
2. If your changes are helpful for others, send in a pull request via GitHub and
wait for them to be merged in the core.
$ cd apps/frappe/
$ git status
# branch master
# Your branch is behind 'upstream/master' by 9 commits, and can be fast-forwarded.
# (use "git pull" to update your local branch)
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# yarn.lock
no changes added to commit (use "git add" and/or "git commit -a")
Can someone double check and confirm?
Thx