azure devops

Azure DevOps GIT Repository Error: Next steps: Manually resolve these conflicts and push new changes to the source branch. When merging a branch into master you might receive an error…