The ConflictResolution client API is used to view and resolve conflicts between configurations.
Argument |
Description |
---|---|
Parameter 1 |
IsViewOnly |
Parameter 1 description |
Allows you to control whether merge conflicts can be resolved |
Parameter 1 type |
Boolean |
Parameter 1 default |
None |
Parameter 2 |
RelOverrides |
Parameter 2 description |
A list of the relationship definitions or edge definitions to navigate in order to find items in conflict, each separated by a tilde (~) |
Parameter 2 type |
String |
Parameter 2 default |
None |
The ConflictResolution client API uses the following methods.
-
SOPSChangeRequestComparesChanges
-
SOPSChangeRequestResolveConflicts
-
SOPSCompareChanges
-
SOPSResolveConflicts