How to solve error: failed to push some refs to ‘[email protected]:……git pull conflict

The reason for this conflict is that the branch of the remote warehouse has been modified, but you have not pulled it locally, and you have also made the changes locally, so the system does not know whether to focus on the remote warehouse or the local warehouse, so the conflict occurs.

so how to fix it?
Method one:
1. Git Stash saves local changes to the cache
2, the git pull
3. Git Stash Pop # merges local and remote changes
4. At this point, the conflict needs to be resolved manually, as shown below. Delete the marker line, and then determine which needs to be modified
5. Redo git add and git commit,git push

Read More: