core/conflict_resolution library

Classes

ConflictResolver
Helper class to apply conflict resolution strategies on version objects.
VersionResolution
Result of version-based conflict resolution.

Enums

ConflictResolutionStrategy
Defines how to resolve conflicts when both local and remote have changes.
ResolutionWinner
Indicates which side won a version resolution.