What does the red square mean after using git pull in eclipse?

Question

After using git pull to pull down the project, a red square appears in a certain file in the project. Although it does not affect the normal operation of the project, I still want to ask what is going on?

Answer 1

It means that after you pull the remote code, there is a conflict with the local code, usually accompanied by a red square and

Red cross, based on what you see above, you should have resolved the conflict. Just submit the local code.