Class MergeResult


  • public class MergeResult
    extends java.lang.Object
    A result of the merge operation
    • Constructor Detail

      • MergeResult

        public MergeResult()
    • 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)