Uses of Interface
com.atlassian.confluence.util.diffs.MergeResult

Packages that use MergeResult

Package	Description
com.atlassian.confluence.pages
com.atlassian.confluence.plugins.merge
com.atlassian.confluence.util.diffs

Uses of MergeResult in com.atlassian.confluence.pages

Methods in com.atlassian.confluence.pages that return MergeResult

Modifier and Type	Method and Description
MergeResult	DefaultDraftManager.mergeContent(Draft draft) Merges the draft with the original version compared to the latest version of the page.
MergeResult	DraftManager.mergeContent(Draft draft) Attempts the merge the changes done by this draft with the latest version of the content.

Uses of MergeResult in com.atlassian.confluence.plugins.merge

Methods in com.atlassian.confluence.plugins.merge that return MergeResult

Modifier and Type	Method and Description
MergeResult	TDMMerger.mergeContent(String base, String left, String right)
MergeResult	TDMMerger.mergeContent(String base, String left, String right, long timeout, @NonNull TimeUnit unit)

Uses of MergeResult in com.atlassian.confluence.util.diffs

Classes in com.atlassian.confluence.util.diffs that implement MergeResult

Modifier and Type	Class and Description
class	SimpleMergeResult

Fields in com.atlassian.confluence.util.diffs declared as MergeResult

Modifier and Type	Field and Description
static MergeResult	SimpleMergeResult.FAIL_MERGE_RESULT

Methods in com.atlassian.confluence.util.diffs that return MergeResult

Modifier and Type	Method and Description
MergeResult	Merger.mergeContent(String base, String left, String right) Merge the content provided.
MergeResult	PageLayoutAwareMerger.mergeContent(String base, String left, String right)