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.
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
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.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Have you modified something locally and then committed it but not pushed it
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.
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
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.