|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
public static interface ControllableResource.Conflict
A version-controlled resource for which new content would have to be created to perform the merge.
Method Summary | |
---|---|
Version |
getCommonAncestor()
Return a version that is the nearest common ancestor of all the versions to be merged. |
ControllableResource |
getTarget()
Return a version-controlled resource that would be updated by the merge request. |
java.util.List |
getVersionList()
Return a list of Version objects, that identifies the versions
to be merged to the specified target. |
Method Detail |
---|
ControllableResource getTarget()
Version getCommonAncestor()
java.util.List getVersionList()
Version
objects, that identifies the versions
to be merged to the specified target.
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |