Pull Request merged automatically. Why?
Platform Notice: Cloud Only - This article only applies to Atlassian products on the cloud platform.
Summary
Pull request(s) appear to have merged automatically.
Diagnosis
A pull request was merged automatically when another pull request was merged.
A pull request was merged when merge checks were not met.
Cause
Bitbucket Cloud automatically merges a pull request when the changes (commits) on it are merged by another pull request. The same will also happen if the changes introduced in the Pull request are removed from the source branch, through a force push, for example.
Example scenario 1:
Create a branch branch1 from the main branch.
Make a commit commit1 in the branch branch1.
Create a Pull Request PR1 from branch branch1 to the main branch. This Pull request will have only commit1 as part of the change.
Create a branch branch2 from branch1 branch.
Make a commit commit2 in the branch branch2.
Create a Pull Request PR2 from branch branch2 to the main branch. This Pull request will have commit1 and commit2 as part of the change.
Merge the pull request PR2
Note that when Pull request PR2 is merged, Bitbucket will also automatically merge Pull request PR1. The reason is the commit commit1 that Pull request PR1 was planning to merge has already been merged in the main branch. Since the pending changes on Pull request PR1 have been merged, it's unnecessary to keep Pull request PR1 open. The Pull request PR1 will be merged even if merge checks are incomplete.
Example scenario 2:
Create a branch1 from the main branch.
Make a commit commit1 in the branch branch1.
Create a pull request from branch1 to main branch.
Perform a rebase on the branch1, rewriting the branch history to a point before the commit1.
When you rebase branch1, the pull request diff will become empty. The Pull request will then be automatically marked as merged since there are no changes to merge.
Solution
Identify the source branch of both of the Pull requests
Identify the merge base commit of both source branches using the command git merge-base source_branch1 source_branch2
Find the commits in both source branches after the merge base commit using the commands:
1
2
3
4
5
git checkout source_branch1
git git show $(git merge-base source_branch1 source_branch2)
git checkout source_branch2
git git show $(git merge-base source_branch1 source_branch2)Note that the branch that was the source branch of the pull request merged automatically will not have any commit after the merge base commit. However, there will be some additional commits in another source branch. That indicates no further commits in source_branch1 after the branch source_branch2 was created from the source_branch1 branch. All the commits (from source_branch1) that Pull request PR1 was planning to merge are already part of the Pull request PR2, with some additional commits in the PR2 from the source_branch2 branch.
The pull request is merged because all the commits that it planned to merge are already part of another pull request that was merged.
Was this helpful?