public class ConflictAnnotatingRebaseDiff extends AbstractRebaseDiff
AbstractRebaseDiff
implements a NodeStateDiff
,
which performs the conflict handling as defined in NodeStore.rebase(NodeBuilder)
on the Oak SPI state level by annotating conflicting items with conflict
markers.Constructor and Description |
---|
ConflictAnnotatingRebaseDiff(NodeBuilder builder) |
childNodeAdded, childNodeChanged, childNodeDeleted, propertyAdded, propertyChanged, propertyDeleted
public static final String CONFLICT
public ConflictAnnotatingRebaseDiff(NodeBuilder builder)
"Copyright © 2006 - 2015 Adobe Systems Incorporated. All Rights Reserved"