Bench update problem after customize files

[abu.sayeed]

I have installed erpnext 11.1.77 and frappe 11.1.69.
Bench update successfully.

But I change a favicon.png file.
Then bench update not working.

Show:

1. Merge the erpnext app manually with “git pull” / “git pull --rebase” and fix conflicts.
2. Temporarily remove your changes with “git stash” or discard them completely
   with “bench update --reset” or for individual repositries “git reset --hard”
3. If your changes are helpful for others, send in a pull request via GitHub and

git stash and bench update. I see default favicon.png file.
I wish to change favicon.
What will be appropriate command so that my custom favicon.png file not replace by default favicon.png

Thanks

[kennethsequeira]

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.

ERPNext uses git for managing updates. If you make any changes in the core files directly, it creates a conflict when pulling the latest changes since there is a difference of the changes it is expecting v/s those made by you.

The reset option overrides the changes made.

You can stash the changes and re-apply them every time if you want to maintain the customization done. Else look at other methods to achieve it.

https://git-scm.com/docs/git-stash