Interface MergeResult
- 
- All Known Implementing Classes:
 SimpleMergeResult
public interface MergeResult 
- 
- 
Method Summary
All Methods Instance Methods Abstract Methods Modifier and Type Method Description StringgetMergedContent()Returns the result of the merge.booleanhasConflicts()True if the merge failed. 
 - 
 
- 
- 
Method Detail
- 
hasConflicts
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
 
 
- 
getMergedContent
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.
 
 
 - 
 
 -