Reference blog: https://blog.csdn.net/nan7_/ article/details/25624637

Your local changes would be overwritten by merge. Commit, stage or revert them to proceed

Cause: git conflict

1. Use the GIT repository stash changes command to save your changes

At this time, you will find that the modified parts are gone and return to the original state

2、pull

Download the code on GIT

3、git-repository-Unstash changes

Take out your own code and compare and merge the code

In the comparison page, the version in Git library is on the left, the original version is in the middle, and your own version is on the right