Question about editing files then updating using bench update

[kennethsequeira]

If you make changes to the code and run bench update you will get a merge conflict. In that case you can stash your existing changes and then run the update.

The following thread should help you:

Cannot proceed with update: You have local changes in app "frappe" that are not committed

Cannot proceed with update: You have local changes in app “frappe” that are not committed. Here are your choices: Merge the frappe app manually with “git pull” / “git pull --rebase” and fix conflicts. Temporarily remove your changes with “git stash” or discard them completely with “bench update --reset” or for individual repositries “git reset --hard” If your changes are helpful for others, send in a pull request via GitHub and wait for them to be merged in the core.