OVERALL RATINGS
INSTALLS
71
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.
Key highlights of the appExposes downstream merge conflicts resulting from automatic merge behavior
Supporting media
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!
Resources
Download
Get the .jar file downloaded to your system
App documentation
Comprehensive set of documentation from the partner on how this app works
EULA
Get the End User License Agreement for this app
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 policySecurity program
This app is not part of the Marketplace Bug Bounty program.
Version information
We no longer offer sales and support for server apps. You can still explore the earlier versions but these may not offer the necessary support.