This documentation is archived and is not being maintained.
Conflict::MergeProperties Method
Visual Studio 2013
Generates the properties merge summary. Returns null if there is no property conflict.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Parameters
- workspace
- Type: Microsoft.TeamFoundation.VersionControl.Client::Workspace
The workspace.
Return Value
Type: Microsoft.TeamFoundation.VersionControl.Client::PropertiesMergeSummaryThe properties merge summary.
- Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.
Show: