Best practice for development on Bench + ERPnext

Can someone give me pointers on the best way to develop on Erpnext + Frappe Bench while still being able to do bench update regularly without merging or syncing issue.

Thanks!

If you’re developing on ERPNext itself, then commit often, and rebase with upstream often. If not, then avoid changing Frappe / ERPNext code entirely, and write your logic in a separate app.

If you NEED to modify ERPNext and if that modification NEEDS to be in the repo, and not in the upstream, then maintain your own fork which you can periodically rebase with upstream.

1 Like

Easiest way is to keep ensuring your patches get merged upstream, by sending pull requests.

Thanks folks. I figured git upstream is probably still the best way to go.