B
Beth Kelley
Guest
We are using VS 2015 Update 3. Everything is updated. We are using Azure DevOps Git for our source control.
When we try to merge from the dev branch into our individual branches, it states that there are conflicts, and that files will be overwritten so it errors out and does not merge. The resolve conflicts link does not appear at all so that we can resolve these conflicts. We have the Diff and Merge set in global settings to Visual Studio, and downloaded various third party Git tools, but still no resolve conflict ability.
We cannot do a pull request until these conflicts are manually taken care of.
What are we missing?
Thanks,
Beth
Continue reading...
When we try to merge from the dev branch into our individual branches, it states that there are conflicts, and that files will be overwritten so it errors out and does not merge. The resolve conflicts link does not appear at all so that we can resolve these conflicts. We have the Diff and Merge set in global settings to Visual Studio, and downloaded various third party Git tools, but still no resolve conflict ability.
We cannot do a pull request until these conflicts are manually taken care of.
What are we missing?
Thanks,
Beth
Continue reading...