This documentation is archived and is not being maintained.

Conflict::MergeProperties Method

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)

public:
PropertiesMergeSummary^ MergeProperties(
	Workspace^ workspace
)

Parameters

workspace
Type: Microsoft.TeamFoundation.VersionControl.Client::Workspace

The workspace.

Return Value

Type: Microsoft.TeamFoundation.VersionControl.Client::PropertiesMergeSummary
The properties merge summary.

Show: