// When a row has been changed in both parent and second
// states, the row from the changes state is used.
// The parent and changes states must be open or owned by
// the current user unless the current user is the ArcSDE
// DBA.
newState.merge(realParent.getId(), parentState.getId());
}
return newState;
}