C# (CSharp) ConflictResolver.ToArray Examples

Example #1

        public CodeManager MergeBranches(UserDialog dialog)
        {
            var leftCommand  = LeftCommands.Single();
            var rightCommand = RightCommands.Single();

            var commands = new ConflictResolver().ResolveConflict(dialog, leftCommand, rightCommand);

            dialog.Completed();

            var utility = new Utility();

            return(new CodeManager(utility.ApplyCommands(_code, commands.ToArray())));
        }