Common Objections to Automated Merging

While the vast majority of people that we've shown the MergeMagician automated merging concept to have been enthusiastic about the capabilities, a few have asked some probing questions that deserve discussion. In this page, we'll address some of the common objections and misconceptions to automated merging.

Myth #1 : Automated merging can't work because there are always merge conflicts

This is a valid concern, and we believe any approach to automated merging must address this potential problem. Even though automated merging will greatly reduce merge conflicts, we must still have a solution for the rare cases when there is a merge conflict, otherwise the system is untrustworthy.

For this reason, we have designed MergeMagician from the ground up to address merge conflicts. Using an elegantly integrated approach, the MergeMagician workflow engine allows suspending and resuming the merge while conflicts are resolved. The workflow process works in conjunction with the web-based collaborative merging component. Because this component is web-based, anyone on the team, including developers, managers, quality assurance personnel, or technical writers can participate in the resolution process. MergeMagician archives all resolutions, providing a complete audit trail of what was done.

Myth #2 : Branching is a bad idea because it defers a huge merge task to the end of the project

This objection stems from the fact that up until now there haven't been good tools to automate and simplify the merging process. When merging is a tedious, time-consuming process, developers will naturally avoid in favor of "real" work.

With an automated, server-based merging tool, there is simply no reason to fear branching and merging.

Myth #3 : With agile software development, branches are unnecessary

Certainly there are cases where branches are not needed. Branches are a valid approach to software development, and should be used when and where appropriate.

What we've found, however, is that there are many cases where branching would be of value to the team, but the team avoids them out of fear that the merging process will be a nightmare. With MergeMagician, that no longer needs to be the case.

MergeMagician is simply another tool in the developer's toolbox. Teams that are already benefiting from branching and merging can realize huge time savings and productivity increases by utilizing MergeMagician. Teams that avoid branching and merging for the wrong reasons now have a new tool in their arsenal.