[
https://issues.apache.org/jira/browse/OAK-242?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Michael Dürig resolved OAK-242.
-------------------------------
Resolution: Fixed
Fix Version/s: 0.5
Fixed at revision 1373445
> Mixin rep:MergeConflict is not a registered node type
> -----------------------------------------------------
>
> Key: OAK-242
> URL: https://issues.apache.org/jira/browse/OAK-242
> Project: Jackrabbit Oak
> Issue Type: Bug
> Reporter: angela
> Assignee: Michael Dürig
> Fix For: 0.5
>
>
> the internal mixin type rep:MergeConflict (aka mix:mergeConflict) is
> not registered with the node type manager.
> adding the CND definition to the buildin node types list present in
> oak-core resources should help.
> if doing so i would suggest to review the definition. looking at the
> cnd currently present in the javadoc of AnnotatingConflictHandler
> i got the impression that it should have the OPV flag set. according to
> the cnd definition in jsr 283 the default value is COPY if no OPV-flag
> is specified and i am not sure if that is intended.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
