All Classes
-
All Classes Interface Summary Class Summary Enum Summary Exception Summary Class Description CollisionException Any exception raised when facing a collision during a 3 ways merge.MergeConfiguration Allow to define some behaviors of the merge.MergeConfiguration.ConflictFallbackVersion Versions to use as fallback in case of conflicts.MergeConflictDecisionsManager Manage the decisions taken to solve the merge conflicts.MergeDocumentResult Store information about a merge operation of documents.MergeDocumentResult.DocumentPart Represents the different parts of a document that are merged.MergeException Any exception raised during a merge.MergeManager Provides general merge utility methods.MergeManagerResult<R,C> This represents the result of a merge operation: it contains both the result of the merge, the possible conflicts that happened during the merge, and the logs.MergeResult Deprecated. Since 11.8RC1, prefer usingMergeManagerResult
.