Visual Studio Enterprise Git 合并完成但有冲突
[英]Visual Studio Enterprise Git Merge completed with conflicts
问题描述
This approach used to work before - I'm not sure what is different.
这种方法以前可以使用-我不确定有什么不同。 I'm working on a sub branch and have a bunch of my changes and there have been changes to the main branch made by others.我正在处理一个子分支，并进行了很多更改，并且其他人对主分支进行了更改。 I want to get those changes on my sub branch.我想在我的子分支上进行这些更改。
In Git Changes I go to remotes and select the mainBranch then "merge into current branch" as below在 Git 将 I go 更改为遥控器和 select 主分支然后“合并到当前分支”如下
I get prompted with:我收到提示：
Finally I get the error:最后我得到了错误：
1 个解决方案
解决方案1
0 已采纳 2021-05-19 08:37:56
The resolution was that I needed to commit my changes first.决议是我需要先提交我的更改。 After that I could proceed as per above.之后，我可以按照上述进行。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.