
Exposes downstream merge conflicts resulting from automatic merge behavior
Exposes downstream merge conflicts resulting from automatic merge behavior
Exposes downstream merge conflicts resulting from automatic merge behavior
More details
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!
Reviews for cloud
(7)Sign in to write a review




Reviews for server
(7)Sign in to write a review




Reviews for Data Center
(7)Sign in to write a review




Cloud Pricing
Server Pricing
Data Center Pricing
Basic support resources are available for this app.
Vendor support resources
Find out how this app works.
Atlassian-hosted discussions connect you to other customers who use this app.
Versions
Version 3.0.0 • Bitbucket Server 7.0.0 - 7.9.1 • Released 2020-08-21
Summary
Bitbucket 7 compatibility
Installation
- Log into your Bitbucket instance as an admin.
- Click the admin dropdown and choose Add-ons. The Manage add-ons screen loads.
- Click Find new apps or Find new add-ons from the left-hand side of the page.
- Locate AutoMerge Conflict Detector via search. Results include app versions compatible with your Bitbucket instance.
- Click Install to download and install your app.
- You're all set! Click Close in the Installed and ready to go dialog.
To find older AutoMerge Conflict Detector versions compatible with your instance, you can look through our version history page.