• git stash提示xx文件: needs merge

使用git add .

  • vscode解决冲突

Current Change是新代码,Incoming Change是旧代码。

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

git clean -d -fx