azure devops - merge conflict In ADO Repo

Question

Merge request in ADO repo is only showing the message "there are conflict" but it is not showing the file and lines number, where conflict happened.

Please help me to resolve this issue.

question from:https://stackoverflow.com/questions/65843054/merge-conflict-in-ado-repo

Answer 1

Basically when you have information about merge conflict you should solve it on your machine and push it to your branch. This is why you don't have conflict details.

You can also try to use this extension - Pull Request Merge Conflict Extension