As with reconciling, the geometric network editing rules apply to conflict resolution:
Simple edges do not support midspan connectivity; complex edges do support midspan connectivity.
Orphan junctions cannot subsume each other.
An edge must always have at least two junctions, one at each endpoint.
For conflicts that involve the feature being deleted in one of the versions, the following set of rules governs the behavior that you will see when restoring or removing the feature in conflict.
When restoring features, the following rules apply:
Restoring an edge restores the endpoint junctions.
Restoring a junction will not restore connected edges.
When removing features, the following rules apply:
Removing an edge will not remove the junctions.
Removing an endpoint junction removes the edge.
As opposed to the reconciliation process itself, conflict resolution can lead to the creation of new features. These are not features replaced from another version but new features that are the result of conflict replacement. This happens when an edge is replaced which has a connectivity rule with a default junction type defined. In this instance, a new default junction will be created.