git pull 提示错误:Your local changes to the following files would be overwritten by merge

Insert picture description here

Solution:

  1. git stash // Temporarily store the work currently in progress.
  2. git pull origin master //Pull the code of the server
  3. git stash pop //Merge temporary code

Guess you like

Origin blog.csdn.net/lqlq54321/article/details/107694092