Interface EnumDSSXMLConflictResolution


  • public interface EnumDSSXMLConflictResolution
    This interface defines the enumeration constants of possible ways to resolve a merge conflict. A merge conflict occurs when different instances of the same object exist in both source and destination object sources. This enumeration describes various things that the manipulator can do when it encounters a conflict.
    • Field Detail

      • DssXmlConflictNone

        static final int DssXmlConflictNone
        Do not resolve the merge conflict
        See Also:
        Constant Field Values
      • DssXmlConflictExisting

        static final int DssXmlConflictExisting
        Use the existing object (that is the object in the destination source)
        See Also:
        Constant Field Values
      • DssXmlConflictReplace

        static final int DssXmlConflictReplace
        Replace the existing object (that is use the object in the source)
        See Also:
        Constant Field Values
      • DssXmlConflictEarlier

        static final int DssXmlConflictEarlier
        Use the object with earlier time stamp (if stamps are the same we use existing)
        See Also:
        Constant Field Values
      • DssXmlConflictLater

        static final int DssXmlConflictLater
        Use the object with later time stamp (if stamps are the same we use existing)
        See Also:
        Constant Field Values
      • DssXmlConflictKeepBoth

        static final int DssXmlConflictKeepBoth
        Gave the replacement object a new name and ID so it can be copied as a different object
        See Also:
        Constant Field Values
      • DssXmlConflictMask

        static final int DssXmlConflictMask
        Mask that separates the conflict resolution from any other bits we might use
        See Also:
        Constant Field Values
      • DssXmlConflictForce

        static final int DssXmlConflictForce
        Flag set to force conflict rule to apply when there is no apparent merge conflict
        See Also:
        Constant Field Values
      • DssXmlConflictPreserveHidden

        static final int DssXmlConflictPreserveHidden
        Preserving the existing object's hidden property. It's used in MDUpdate to keep the hidden property of objects that may be updated from delta files.
        See Also:
        Constant Field Values
      • DssXmlConflictForceKeepBoth

        static final int DssXmlConflictForceKeepBoth
        Keep both objects, even if there is no merge conflict
        See Also:
        Constant Field Values
      • DssXmlConflictForceReplace

        static final int DssXmlConflictForceReplace
        For path resolution, replace even if there is no main object merge conflict
        See Also:
        Constant Field Values