Package jetbrains.buildServer.vcs
Class MergeResult
- java.lang.Object
-
- jetbrains.buildServer.vcs.MergeResult
-
public class MergeResult extends java.lang.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(java.lang.String conflict)
static MergeResult
createMergeError(java.lang.String mergeError)
static MergeResult
createMergeError(java.util.List<java.lang.String> conflicts)
static MergeResult
createMergeNotPerformedResult(java.lang.String reason)
static MergeResult
createMergeSuccessResult()
java.util.List<java.lang.String>
getConflicts()
java.lang.String
getMergeError()
java.lang.String
getMergeNotPerformedReason()
boolean
isMergePerformed()
boolean
isSuccess()
void
setConflicts(java.util.List<java.lang.String> conflicts)
void
setMergeError(java.lang.String mergeError)
void
setMergeNotPerformedReason(java.lang.String mergeNotPerformedReason)
-
-
-
Method Detail
-
createMergeNotPerformedResult
@NotNull public static MergeResult createMergeNotPerformedResult(@NotNull java.lang.String reason)
-
createMergeError
@NotNull public static MergeResult createMergeError(@NotNull java.lang.String mergeError)
-
createMergeError
@NotNull public static MergeResult createMergeError(@NotNull java.util.List<java.lang.String> conflicts)
-
createMergeSuccessResult
@NotNull public static MergeResult createMergeSuccessResult()
-
isMergePerformed
public boolean isMergePerformed()
-
getMergeNotPerformedReason
@Nullable public java.lang.String getMergeNotPerformedReason()
-
setMergeNotPerformedReason
public void setMergeNotPerformedReason(java.lang.String mergeNotPerformedReason)
-
isSuccess
public boolean isSuccess()
-
getMergeError
@Nullable public java.lang.String getMergeError()
-
setMergeError
public void setMergeError(java.lang.String mergeError)
-
getConflicts
@NotNull public java.util.List<java.lang.String> getConflicts()
-
addConflict
public void addConflict(@NotNull java.lang.String conflict)
-
setConflicts
public void setConflicts(@NotNull java.util.List<java.lang.String> conflicts)
-
-