Visual Studio Enterprise Git Merge completed with conflicts
Question
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
I get prompted with:
Finally I get the error:
1 answers
solution1
0 ACCPTED 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.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.
Related Question
Visual Studio Git sln file merge conflicts
Visual Studio Code how to resolve merge conflicts with git?
Git + Windows + Visual Studio Merge Conflicts Caused by Line Ending Issues between branches
How can I get Visual Studio to show merge conflicts under git?
Solve a bunch of Visual Studio git conflicts
git merge images with conflicts
Git Fork/Merge Conflicts?
git merge repeating conflicts
Git hook for merge conflicts
Git: resolving merge conflicts
Related Tags