As we continue to move towards a cloud future together, new server app sales and installs are no longer available for customers. You can update app version via Atlassian Marketplace until the end of support for server on Feb 15, 2024. Learn more
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 policySecurity
Resources
Gallery
Example results from a repository with two release branches and a master default branch.