public class SimpleMergeResult extends Object implements MergeResult
Modifier and Type | Field and Description |
---|---|
static MergeResult |
FAIL_MERGE_RESULT |
Constructor and Description |
---|
SimpleMergeResult(boolean conflicts,
String mergedContent) |
Modifier and Type | Method and Description |
---|---|
String |
getMergedContent()
Returns the result of the merge.
|
boolean |
hasConflicts()
True if the merge failed.
|
public static final MergeResult FAIL_MERGE_RESULT
public SimpleMergeResult(boolean conflicts, String mergedContent)
public String getMergedContent()
MergeResult
getMergedContent
in interface MergeResult
public boolean hasConflicts()
MergeResult
hasConflicts
in interface MergeResult
Copyright © 2003–2020 Atlassian. All rights reserved.