AutoMerge Conflict Detector

for Bitbucket Server 7.11.1 - 8.19.1 and more
77 installs

We no longer offer sales and support for server apps. You can stay connected by exploring the migration options to either the cloud or Data Center version of this app.

Exposes downstream merge conflicts resulting from automatic merge behavior

AutoMerge Conflict Detector adds a button to the pull request view that exposes any conflicts resulting from automatic merging. Every time the button is pressed, the plugin performs a series of dry-run merges against the pull request target, master, and all upstream release branches. The number of conflicts and the conflicting file names are displayed in addition to a link to compare diffs.

Only branches fitting the "release/" naming convention will test automatic merge results. All other targets will be tested with a merge to itself and the default branch. Future configuration options to come!

Privacy and security

Privacy policy

Atlassian's privacy policy is not applicable to the use of this app. Please refer to the privacy policy provided by this app's partner.

Partner privacy policy



Example results from a repository with two release branches and a master default branch.