Solution to git pull conflict

Processing steps:

1. First store the local modifications $git stash, so that all local modifications are temporarily stored. Using git stash list, you can see the saved information: git stash is temporarily modified, where stash @{0} is the tag just saved. 2. After the pull content is temporarily modified locally, you can pull. $git pull 3. Restore the temporary contents $git stash pop stash @{0} the system prompts the following similar information: Auto merging C / environ c 　　CONFLICT (content): Merge conflict in c/environ. C means that the system automatically merges the modified content, but there are conflicts, which need to be solved. 4. Resolve the conflicting part of the file. Open the conflicting file and you will see the following content: git conflicting content. The content between updated upstream and = = = = = = is the pulled content, and the content between = = = = and stalled changes is the locally modified content. In this case, GIT does not know which line of content is needed, so it should determine the required content by itself. After the solution is completed, it can be submitted normally.