Introducing MergeMagician

MergeMagician is a unique approach to the problem of parallel software development using source code branches. Examples of parallel development include service pack branches, feature branches, bug fix branches, team branches, and promotion branches.

Automated Merging

MergeMagician is an automated merging server designed to work with your existing software configuration management (SCM) system. Using an elegant and innovative approach, MergeMagician connects your branches together using publishers and subscribers. You can create as many publishers and subscribers as you'd like. Based on these branch relationships, MergeMagician automatically migrates code from their original source branches to their destination branches.

Supported SCM Systems

Currently MergeMagician support Subversion and Microsoft Team Foundation Server. Future versions of MergeMagician will support all popular version control systems.

Automated Merging & Continuous Integration

MergeMagician is particularly useful for agile development teams utilizing continuous integration (CI), and who wish to benefit from parallel development. In the past, it has been quite difficult to use CI and branching together. For example, if you create separate branches for each feature under development, there's no automated way of running a CI build on the combined feature set. With MergeMagician, the separate feature branches can be automatically merged into an integration branch, where it could then be built using a CI server.

• Save developer's time with "set-and-forget" automated merging
• Enable multi-stage continuous integration
• Merge with confidence
• Minimize conflicts by merging often
• Visualize your branching strategy
• Code goes where it should, when it should
• Keep an audit trail of all merge activity
• Monitor in-progress merge activity
• Resolve conflicts quickly with collaborative, web-based conflict resolution
  

• "I think you're onto something significant here."
• "I think that would be a useful tool, especially for large dev groups."
• "I have to implement such a tool in a very, very short timeframe."
• "It looks very cool."
• "I would be interested in learning more."
• "We've been looking for a tool like this, but haven't found anything."
• "In order to use the mainline agile approach, we need an automated merging solution."