Branches Are Useful For … Feature Branches Team Branches Release & Maintenance Branches Customized Application Versions Challenges With Branches Impedes continuous integration efforts Defers a large integration task until the end of the project Merge conflicts are difficult to deal with It’s a hassle for the development team The MergeMagician Solution Facilitates agile development and continuous integration Merges aren’t deferred until end of project Reduces merge conflicts Conflicts are fast and easy to resolve The server does the work of merging How MergeMagician Works Connect branches with publisher/subscriber model The service performs merges in the background Conflicted merge jobs are automatically suspended Web-based conflict resolution component allows the team to resolve conflicts quickly Connection Rules Publisher and Subscriber Types Continuous Scheduled Externally Triggered Connection Matrix Continuous/Continuous Continuous/Scheduled Continuous/External Scheduled/Continuous Schedule/Scheduled Scheduled/External External/Continuous External/Scheduled External/External