C# (CSharp) ITFVCConflict Examples

Example #1

        public void ResolveConflict(ITFVCConflict conflict)
        {
            var conflictWrapper = (ConflictWrapper)conflict;

            Workspace.ResolveConflict(conflictWrapper.Conflict);
        }

Example #2

        public bool MergeContent(ITFVCConflict tfvcConflict, bool useExternalMergeTool)
        {
            var conflictWrapper = (ConflictWrapper)tfvcConflict;

            return(Workspace.MergeContent(conflictWrapper.Conflict, useExternalMergeTool));
        }