In Azure Repos, I have created a PR from branch A to branch B. There aren't any merge conflict displayed. But I end up with the warning message
Warning: Multiple merge bases detected. The list of commits displayed might be incomplete.
What does this mean?
I got the same message today. I just pulled the latest changes from the destination branch and merged them in the source branch and the issue was resolved.
Just take the latest changes of the destination branch to the source branch and complete the merge. After that this message will not come up on the pull request page.
In my opinion, this is good that Azure DevOps is giving such a warning, so that if you forgot to take the latest from the target branch before finishing your pull request, it may save some time or end moment rush & surprise.
I had this happen to multiple teammates today. It was occurring because they were about to merge a PR into our main branch before merging that main (remote) branch into their (local) branch first. Their local branch was several commits behind.
Once they merged, committed, and pushed, the message disappeared.
If I am correct, this warning is useless, because Azure DevOps also has a feature to detect merge conflicts. And I am getting this warning no matter if there are any conflicts or not:
If there are merge conflicts detected, then I get this one:
So I would say the proper way to handle merges is by automatic build pipeline, not a warning that confuses everybody.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With