Was this page helpful?
Your feedback about this content is important. Let us know what you think.
Additional feedback?
1500 characters remaining
MSDN Library

VersionControlServer.ResolvedConflict Event

Raised when a Conflict is resolved.

Namespace:  Microsoft.TeamFoundation.VersionControl.Client
Assembly:  Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)

member ResolvedConflict : IEvent<ResolvedConflictEventHandler,
    ResolvedConflictEventArgs>

Show:
© 2015 Microsoft