Uses of Interface
com.atlassian.bitbucket.content.ConflictChange

Packages that use ConflictChange

Package	Description
com.atlassian.bitbucket.content

Uses of ConflictChange in com.atlassian.bitbucket.content

Methods in com.atlassian.bitbucket.content that return ConflictChange

Modifier and Type	Method and Description
ConflictChange	Conflict.getOurChange() Retrieves "our" change, which describes the change that was made on the destination branch relative to a shared ancestor with the incoming branch.
ConflictChange	Conflict.getTheirChange() Retrieves "their" change, which describes the change that was made on the incoming branch relative to a shared ancestor with the destination branch.