public static NodeConflict Merge(
NodeElement commonAncestrorElement,
NodeElement elementInSourceBranch,
NodeElement elementInDestinationBranch,
out NodeDifference differenceInSourceBranch,
out NodeDifference differenceInDestinationBranch)
{
differenceInSourceBranch = (NodeDifference)elementInSourceBranch.CompareTo(commonAncestrorElement)
?? new NodeDifference(new ElementIdentifier("SolutionFile"), OperationOnParent.Modified, null);
differenceInDestinationBranch = (NodeDifference)elementInDestinationBranch.CompareTo(commonAncestrorElement)
?? new NodeDifference(new ElementIdentifier("SolutionFile"), OperationOnParent.Modified, null);
return((NodeConflict)differenceInSourceBranch.CompareTo(differenceInDestinationBranch));
}
public static NodeConflict Merge(
NodeElement commonAncestrorElement,
NodeElement elementInSourceBranch,
NodeElement elementInDestinationBranch,
out NodeDifference differenceInSourceBranch,
out NodeDifference differenceInDestinationBranch)
{
differenceInSourceBranch = (NodeDifference) elementInSourceBranch.CompareTo(commonAncestrorElement)
?? new NodeDifference(new ElementIdentifier("SolutionFile"), OperationOnParent.Modified, null);
differenceInDestinationBranch = (NodeDifference) elementInDestinationBranch.CompareTo(commonAncestrorElement)
?? new NodeDifference(new ElementIdentifier("SolutionFile"), OperationOnParent.Modified, null);
return (NodeConflict)differenceInSourceBranch.CompareTo(differenceInDestinationBranch);
}
