[ https://issues.apache.org/jira/browse/JCR-2780?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12923480#action_12923480 ]
Stefan Guggisberg commented on JCR-2780: ---------------------------------------- +1 for the patch, thanks! > Best effort merge if concurrent modifications include changes to mixin types > ---------------------------------------------------------------------------- > > Key: JCR-2780 > URL: https://issues.apache.org/jira/browse/JCR-2780 > Project: Jackrabbit Content Repository > Issue Type: Improvement > Components: jackrabbit-core > Reporter: angela > Assignee: angela > Fix For: 2.2.0 > > Attachments: JCR-2780.patch > > > currently the NodeStateMerger#merge method immediately aborts if the mixin > types of the 2 nodes are not the same. -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.