git - In phpstorm, an error occurs when pulling the code

Question

After struggling for a long time, I still don’t understand. I committed the local modifications when there was no pull, and then clicked pull. This window popped up. Then how can I update to the version without overwriting the local modifications? What about new code in the library?

phpcn_u1582 · Answer

You will see code conflicts when you click merge. Manually select operations