Resolve Merge Conflicts In Visual Studio Microsoft Learn - Resolve Team Foundation Version Control Conflicts Azure Repos