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 automati

Answer 1

I had to do a rebase. Had to walk through all the commits and apply my changes - they were pretty extensive, renaming namespaces & method names, etc. This then let me continue to do a Pull Request in the Azure DevOps portal. Actually, I could just Refresh changes for the existing Pull Request and the auto merge conflicts were resolved.

Merging the code did not resolve the issue, only rebase worked.