85
Customers have installed this app in at least 85 active instances.
Get it nowFree app

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 tab to the pull request view that exposes any conflicts resulting from automatic merging. Every time the tab is loaded, 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
by Robert Lough (Bobby) on 2017-08-04
This plugin has become part of the standard operating procedure for my team of developers
1 out of 1 found this review helpful
Was this review helpful?YesNo
by Mike Dunphy on 2017-08-01
With this plug-in, our developers are now able to confidently detect and address costly auto-merge failures in a preemptive fashion.
1 out of 1 found this review helpful
Was this review helpful?YesNo
by GaryD on 2017-08-01
This is an extremely useful add-on that will increase productivity and expedite the commit process for everyone who uses Bitbucket in the organization. Gone are the time consuming delays while auto merge failures are being resolved. This is a great idea and long overdue.
1 out of 1 found this review helpful
Was this review helpful?YesNo
by Ladislav Kis on 2017-08-01
We have to juggle multiple release branches and often have to merge changes back several releases back, so we use auto-merge to percolate those changes up towards master. Without this tool, we had to either defensively pre-merge to higher releases, or just hope for the best, and in case of a auto-merge conflict, scramble to fix the conflicts to unblock other developers. This plugin eliminates the guessing, letting us know right away whether the auto-merges will be clean or whether defensive measures need to be taken.
Was this review helpful?YesNo
by Nathan Meyers on 2017-08-01
This plug-in has been a lifesaver. We auto-merge across up to five releases at a time; automerge failures really gum up the works, and this tool makes it easy to detect and preemptively solve them.
1 out of 1 found this review helpful
Was this review helpful?YesNo

Reviews for server

(7)
Sign in to write a review
by Robert Lough (Bobby) on 2017-08-04
This plugin has become part of the standard operating procedure for my team of developers
1 out of 1 found this review helpful
Was this review helpful?YesNo
by Mike Dunphy on 2017-08-01
With this plug-in, our developers are now able to confidently detect and address costly auto-merge failures in a preemptive fashion.
1 out of 1 found this review helpful
Was this review helpful?YesNo
by GaryD on 2017-08-01
This is an extremely useful add-on that will increase productivity and expedite the commit process for everyone who uses Bitbucket in the organization. Gone are the time consuming delays while auto merge failures are being resolved. This is a great idea and long overdue.
1 out of 1 found this review helpful
Was this review helpful?YesNo
by Ladislav Kis on 2017-08-01
We have to juggle multiple release branches and often have to merge changes back several releases back, so we use auto-merge to percolate those changes up towards master. Without this tool, we had to either defensively pre-merge to higher releases, or just hope for the best, and in case of a auto-merge conflict, scramble to fix the conflicts to unblock other developers. This plugin eliminates the guessing, letting us know right away whether the auto-merges will be clean or whether defensive measures need to be taken.
Was this review helpful?YesNo
by Nathan Meyers on 2017-08-01
This plug-in has been a lifesaver. We auto-merge across up to five releases at a time; automerge failures really gum up the works, and this tool makes it easy to detect and preemptively solve them.
1 out of 1 found this review helpful
Was this review helpful?YesNo

Reviews for Data Center

(7)
Sign in to write a review
by Robert Lough (Bobby) on 2017-08-04
This plugin has become part of the standard operating procedure for my team of developers
1 out of 1 found this review helpful
Was this review helpful?YesNo
by Mike Dunphy on 2017-08-01
With this plug-in, our developers are now able to confidently detect and address costly auto-merge failures in a preemptive fashion.
1 out of 1 found this review helpful
Was this review helpful?YesNo
by GaryD on 2017-08-01
This is an extremely useful add-on that will increase productivity and expedite the commit process for everyone who uses Bitbucket in the organization. Gone are the time consuming delays while auto merge failures are being resolved. This is a great idea and long overdue.
1 out of 1 found this review helpful
Was this review helpful?YesNo
by Ladislav Kis on 2017-08-01
We have to juggle multiple release branches and often have to merge changes back several releases back, so we use auto-merge to percolate those changes up towards master. Without this tool, we had to either defensively pre-merge to higher releases, or just hope for the best, and in case of a auto-merge conflict, scramble to fix the conflicts to unblock other developers. This plugin eliminates the guessing, letting us know right away whether the auto-merges will be clean or whether defensive measures need to be taken.
Was this review helpful?YesNo
by Nathan Meyers on 2017-08-01
This plug-in has been a lifesaver. We auto-merge across up to five releases at a time; automerge failures really gum up the works, and this tool makes it easy to detect and preemptively solve them.
1 out of 1 found this review helpful
Was this review helpful?YesNo

Cloud Pricing

Server Pricing

Data Center Pricing

Basic support resources are available for this app.

Vendor support resources

Documentation

Find out how this app works.

See existing Q&A in Atlassian CommunityAsk a question in the Atlassian Community

Atlassian-hosted discussions connect you to other customers who use this app.

Versions

Version 2.0.3 Bitbucket Server 5.0.0 - 5.16.0 Released 2017-07-28

Summary

Repackaged Jar

Installation

  1. Log into your Bitbucket instance as an admin.
  2. Click the admin dropdown and choose Add-ons. The Manage add-ons screen loads.
  3. Click Find new apps or Find new add-ons from the left-hand side of the page.
  4. Locate AutoMerge Conflict Detector via search. Results include app versions compatible with your Bitbucket instance.
  5. Click Install to download and install your app.
  6. 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.

Similar apps