error: Your local changes to the following files would be overwritten by merge

Scene: After switching to the branch in branch feature_A feature_B, using git pull on the branch feature_B, the following error occurs.

wrong description:

error: Your local changes to the following files would be overwritten by merge:

Please commit your changes or stash them before you merge.

error: The following untracked working tree files would be overwritten by merge:

Please move or remove them before you merge.

Aborting
Updating 5fa2f5a..0a8456f

 

 

Guess you like

Origin www.cnblogs.com/john123/p/11517737.html