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.Modifier and Type | Field and Description |
---|---|
static java.lang.String |
BASE |
static java.lang.String |
CONFLICT |
static java.lang.String |
OURS |
Constructor and Description |
---|
ConflictAnnotatingRebaseDiff(NodeBuilder builder) |
childNodeAdded, childNodeChanged, childNodeDeleted, propertyAdded, propertyChanged, propertyDeleted
public static final java.lang.String CONFLICT
public static final java.lang.String BASE
public static final java.lang.String OURS
public ConflictAnnotatingRebaseDiff(NodeBuilder builder)
Copyright © 2010 - 2020 Adobe. All Rights Reserved