MergeMagician

Overview

MergeMagician provides a unique approach to the problem of synchronizing code changes across source code branches.  MergeMagician's approach to merging differs from traditional three-way desktop-based merge tools in the following ways:

• MergeMagician does for branching and merging what continuous integration does for software build management. Similar to the way a continuous integration server monitors your repositories and automatically triggers software builds (based on rules you configure), MergeMagician will monitor your version control repositories and automatically merge changes between branches based on a highly configurable set of connection rules.

• MergeMagician is a process management solution specifically designed for the domain of branching and merging source code.
• Finally, MergeMagician is a team collaboration tool designed to let all team members, when needed, participate in the merge resolution process.  When merges encounter conflicts, they are placed into a suspended state where they can be collaboratively resolved by members of the team.

Benefits

Branch With Agility

With MergeMagician, branches are fast and effective for agile developers. MergeMagician manages the merge workflow and lets you control when, where, and how often you want to merge changes. It's great for release branches, team branches, feature branches, and more.

No Merge Gurus Needed

With MergeMagician, developers no longer need to worry about the mechanics of merging. MergeMagician does that for you. When merge conflicts arise, anyone on the team can use the web-based interface for resolving the conflicts.

Turn Your Branches Into Streams

MergeMagician adds streams-based development to Microsoft Team Foundation Server and Subversion. Streams are more useful than ordinary branches because changes from one branch can automatically flow to other branches.