Why is the color displayed when I pull someone else’s code changed when I pull it?
This happens after git status, what should I do? 
给我你的怀抱2017-05-02 09:34:53
Have you modified something locally and then committed it but not pushed it
仅有的幸福2017-05-02 09:34:53
There should be several file conflicts below. After resolving the conflicting files, add them and commit them together. Record that this is a merge operation.
phpcn_u15822017-05-02 09:34:53
This has no impact, because you also have local file modifications, plus your previous pull, pulling other people's files and merging them into your code, it is considered your submission, but I am also curious about the specific reason for this. , I haven’t studied it in depth, but it has no impact on the code
阿神2017-05-02 09:34:53
Possible situation: You have your own modifications locally, and using git add && there is no conflict between the content you pull and your local modifications.