Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
Include Protected Members
Include Inherited Members
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 | |
|---|---|---|
.gif "Public method") |
Resolve(TeamFoundationRequestContext, String, String, Int32, Resolution, String, Int32, LockLevel, array<String[]) | Resolve a specific conflict with a specific resolution. This is called for Get, Checkin, and Merge conflicts. |
|
Resolve(TeamFoundationRequestContext, String, String, Int32, Resolution, String, Int32, LockLevel, array<PropertyValue[], array<String[], array<String[], Boolean) | Resolve a specific conflict with a specific resolution. This is called for Get, Checkin, and Merge conflicts. |
|
Resolve(TeamFoundationRequestContext, String, String, Int32, Resolution, String, Int32, LockLevel, array<PropertyValue[], array<String[], array<String[], Boolean, PathLength) | Resolve a specific conflict with a specific resolution. This is called for Get, Checkin, and Merge conflicts. |
Top