Class MergeBlockedByConflictException

  • All Implemented Interfaces:
    Serializable

    public class MergeBlockedByConflictException
    extends RuntimeException
    Exception that indicates that a merge cannot be performed because it would lead to involuntarily resolving a conflict.
    Since:
    3.5
    See Also:
    Serialized Form
    • Constructor Detail

      • MergeBlockedByConflictException

        public MergeBlockedByConflictException​(Collection<Diff> conflictingDiffs)
        Constructor.
        Parameters:
        conflictingDiffs - The diffs that depend on a conflict
    • Method Detail

      • getConflictingDiffs

        public Collection<Diff> getConflictingDiffs()
        Get the conflicting diffs.
        Returns:
        The conflicting diffs.