Unable to merge the conflict in Azure Devops I have created the Pull Request from api_integration branch to development branch. But there are some conflicts I can see but as my Complete button is disabled, not sure how to deal with code merging here.
I tried to switch to development branch in my android studio and pull the request but it says All files are up to date.
Not sure how to resolve this issue of PR with merge conflict.
Basically you should resolve them locally with git commands, see tutorial here.
But - better way is to use the Pull Request Merge Conflict Extension for Azure DevOps.
After the installation you will have "conflicts" tab inside the PR: