Frontend - Error while pulling code on webstrom?

Question

Your local changes to the following files would be overwritten by merge:
Looking for answers, there are all kinds of questions today.

Thank you!

Answer 1

The modified file has been changed by others and needs to be submitted before it can be pulled
Or if you configure rebase=true
you can add the following

git config --global rebase.autoStash true