Package jetbrains.buildServer.vcs
Class MergeResult
- java.lang.Object
-
- jetbrains.buildServer.vcs.MergeResult
-
public class MergeResult extends Object
A result of the merge operation
-
-
Constructor Summary
Constructors Constructor Description MergeResult()
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description void
addConflict(String conflict)
static MergeResult
createMergeError(String mergeError)
static MergeResult
createMergeError(List<String> conflicts)
static MergeResult
createMergeNotPerformedResult(String reason)
static MergeResult
createMergeSuccessResult()
List<String>
getConflicts()
String
getMergeError()
String
getMergeNotPerformedReason()
boolean
isMergePerformed()
boolean
isSuccess()
void
setConflicts(List<String> conflicts)
void
setMergeError(String mergeError)
void
setMergeNotPerformedReason(String mergeNotPerformedReason)
-
-
-
Method Detail
-
createMergeNotPerformedResult
@NotNull public static MergeResult createMergeNotPerformedResult(@NotNull String reason)
-
createMergeError
@NotNull public static MergeResult createMergeError(@NotNull String mergeError)
-
createMergeError
@NotNull public static MergeResult createMergeError(@NotNull List<String> conflicts)
-
createMergeSuccessResult
@NotNull public static MergeResult createMergeSuccessResult()
-
isMergePerformed
public boolean isMergePerformed()
-
getMergeNotPerformedReason
@Nullable public String getMergeNotPerformedReason()
-
setMergeNotPerformedReason
public void setMergeNotPerformedReason(String mergeNotPerformedReason)
-
isSuccess
public boolean isSuccess()
-
getMergeError
@Nullable public String getMergeError()
-
setMergeError
public void setMergeError(String mergeError)
-
addConflict
public void addConflict(@NotNull String conflict)
-
-