public class

SimpleMergeResult

extends Object
implements MergeResult
java.lang.Object
   ↳ com.atlassian.confluence.util.diffs.SimpleMergeResult

Summary

Fields
public static final MergeResult FAIL_MERGE_RESULT
Public Constructors
SimpleMergeResult(boolean conflicts, String mergedContent)
Public Methods
String getMergedContent()
Returns the result of the merge.
boolean hasConflicts()
True if the merge failed.
[Expand]
Inherited Methods
From class java.lang.Object
From interface com.atlassian.confluence.util.diffs.MergeResult

Fields

public static final MergeResult FAIL_MERGE_RESULT

Public Constructors

public SimpleMergeResult (boolean conflicts, String mergedContent)

Public Methods

public String getMergedContent ()

Returns the result of the merge. If the merge resulted in a conflict this method may return null, or a partially merged string. Implementers should return the data in the same format as the one that was passed in.

Returns
  • result of merge if merge was successful, if the merge had conflicts the return value is undefined.

public boolean hasConflicts ()

True if the merge failed. If true is returned here the return value of getMergedContent() is undefined (likely null).

Returns
  • true if the merge failed, otherwise false