-
interface
This adds the ability for
mergers
to define their own sub-set of "required" differences.
class
Abstract implementation of an
IMerger
.
class
This specific implementation of
AbstractMerger
will be used to merge conflicts in an additive merge
context.
class
This specific implementation of
AbstractMerger
will be used to merge reference changes in an
additive merge context.
class
This specific implementation of
AbstractMerger
will be used to merge resource attachment changes in
an additive merge context.
class
This specific implementation of
AbstractMerger
will be used to merge attribute changes.
class
This specific implementation of
AbstractMerger
will be used to merge real conflicts.
class
This specific implementation of
AbstractMerger
will be used to merge attribute changes.
class
A simple merger for pseudo conflict.
class
This specific implementation of
AbstractMerger
will be used to merge reference changes.
class
This specific implementation of
AbstractMerger
will be used to merge resource attachment changes.
class
Adds a merger to the registry.
Adds a merger to the registry.
Returns the merger, for the given target, owning the highest ranking.
Returns the merger, for the given target, owning the highest ranking.
Removes a merger from the registry, from its class name.
Removes a merger from the registry, from its class name.
Returns the list of the candidate mergers for the given difference.
Returns the list of the candidate mergers for the given difference.
Provide the merger with the highest ranking among those that:
Are compatible with the given diff;
Match the given non-null criterion.
Provide the mergers sorted by rank descending.
Adds a merger to the registry.
Adds a merger to the registry.
ResourceLocationChange
s have been replaced byResourceAttachmentChange
s of kind Move.