场景:在分支feature_A 切换到分支feature_B后,在分支feature_B上使用git pull ,出现如下报错.
错误描述:
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
error: Your local changes to the following files would be overwritten by merge