Hi,
Before anything else, my ERPnext version is:
ERPNext: v10.1.7 (master)
Frappe Framework: v10.1.3 (master)
At first, I have problem with the file yarn.lock, so I have to do bench update --reset every time.
Today, I got another error:
INFO:bench.utils:updating bench
INFO:bench.utils:git pull
Updating ebef11a…aa3b080
error: The following untracked working tree files would be overwritten by merge:
patches.txt
Please move or remove them before you merge.
I never tamper with anything, but it says I have patches.txt which is not tracked.
Content of patches.txt:
bench.patches.v3.deprecate_old_config
bench.patches.v3.celery_to_rq
bench.patches.v3.redis_bind_ip
bench.patches.v4.update_node
bench.patches.v4.update_socketio
bench.patches.v4.install_yarn #2
I tried to remove this file, but it gives me another warning:
This update will remove Celery config and prepare the bench to use Python RQ.
And it will overwrite Procfile and supervisor.conf.
If you don’t know what this means, type Y
Do you want to continue? [y/N]:
I’m not sure what I’m doing, so I just terminated it. Anybody know what does it mean?
And where is this Procfile and supervisor.conf? At least I would like to make a backup before letting it overwrite them.
Thank you in advance.