Azure DevOps - Pull Request Git “Next steps: Manually resolve these conflicts and push new changes to the source branch.”

Question

I have created a branch named dev.

I have done a pull request to send dev code to master, when I do this pull request it tell me: 

50+ conflicts prevent automatic merging "Next steps: Manually resolve these conflicts and push new changes to the source branch."

Where do I go from here? I just want all the dev branch to replace whatever is in master. I see no options to resolve these conflicts.

Answer 1

$ git pull origin master 

You can learn more about Azure DevOps on Azure DevOps tutorial or you can also join Azure DevOps training.

Are you interested in learning Azure from basics! Here's the right video for you on Azure provided by Intellipaat:

After using this command, make sure you follow the steps mentioned in this official document of Microsoft, in order to solve the merge conflicts in your repository.

https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&tabs=visual-studio&viewFallbackFrom=vsts