Workspace.ResolveConflict Method

Include Protected Members
Include Inherited Members

Attempt to resolve a conflict based on its Resolution property.

This member is overloaded. For complete information about this member, including syntax, usage, and examples, click a name in the overload list.

Overload List

	Name	Description
	ResolveConflict(Conflict)	Attempt to resolve a conflict based on its Resolution property.
	ResolveConflict(Conflict, array<Conflict[]%)	Attempt to resolve a conflict based on its Resolution property.
	ResolveConflict(Conflict, array<Conflict[]%, array<String[])	Attempt to resolve a conflict based on its Resolution property.
	ResolveConflict(Conflict, array<Conflict[]%, array<String[], array<String[])	Attempts to resolve a conflict according to the conflict's Resolution property. If the conflict is successfully resolved, the IsResolved property will be true. If resolving this conflict caused other conflicts to be deleted besides the current conflict, then the list of other deleted conflicts will be returned in resolvedConflicts.

Top