AutoMerge Conflict Detector

for Bitbucket Server 7.0.0 - 7.17.0 and more
108 installs
  • Unsupported
Free 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 vendor.

Vendor privacy policy

Security

This app is not part of the Marketplace Bug Bounty program. Learn more

Resources

Gallery

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