Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Warning: Multiple merge bases detected. The list of commits displayed might be incomplete

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.

Screenshot of error

What does this mean?

like image 238
Janani Avatar asked Sep 16 '21 15:09

Janani


Video Answer


4 Answers

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.

like image 138
Jorn.Beyers Avatar answered Oct 23 '22 05:10

Jorn.Beyers


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.

like image 32
JARVIS Avatar answered Oct 23 '22 06:10

JARVIS


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.

like image 6
T H Avatar answered Oct 23 '22 05:10

T H


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:

Enter image description here

If there are merge conflicts detected, then I get this one:

Enter image description here

So I would say the proper way to handle merges is by automatic build pipeline, not a warning that confuses everybody.

like image 5
Juri Avatar answered Oct 23 '22 05:10

Juri