|
|
How MergeMagician Works
At its core, MergeMagician is based on three simple, yet powerful concepts. These three concepts drive the entire design of the program.
| 1. |
Publish/Subscribe - You configure publish/subscribe relationships between your branches.
The server-based MergeMagician daemon monitors your SCM repositories and automates your merges based on these branch relationships.
|
| |
| 2. |
Collaborative Conflict Resolution - Frequent, automated merges will reduce merge conflicts, but can never eliminate them completely.
In situations where conflicts do arise, MergeMagician provides a powerful, yet simple web-based merging tool where multiple developers can work together to resolve the conflict.
|
| |
| 3. |
Suspend/Resume - When a merge conflict occurs, the merge is automatically suspended awaiting conflict resolution.
The web-based conflict resolution component is tightly integrated into the suspend/resume workflow. After all conflicts are resolved, the merge is resumed and completed.
|
|
|
|
