Package org.openl.rules.repository.api
Class ConflictResolveData
- java.lang.Object
-
- org.openl.rules.repository.api.ConflictResolveData
-
- All Implemented Interfaces:
AdditionalData<ConflictResolveData>
public class ConflictResolveData extends Object implements AdditionalData<ConflictResolveData>
-
-
Constructor Summary
Constructors Constructor Description ConflictResolveData(String commitToMerge, Iterable<FileItem> resolvedFiles, String mergeMessage)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description ConflictResolveDataconvertPaths(PathConverter converter)StringgetCommitToMerge()StringgetMergeMessage()Iterable<FileItem>getResolvedFiles()
-
-
-
Method Detail
-
getCommitToMerge
public String getCommitToMerge()
-
getMergeMessage
public String getMergeMessage()
-
convertPaths
public ConflictResolveData convertPaths(PathConverter converter)
- Specified by:
convertPathsin interfaceAdditionalData<ConflictResolveData>
-
-