前端 - 在webstrom上pull代码时出现错误？

Question

Your local changes to the following files would be overwritten by merge:
求解答，今天一天都是各种问题。

谢谢！

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