[
https://issues.apache.org/jira/browse/OAK-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13941068#comment-13941068
]
Michael Dürig commented on OAK-1574:
------------------------------------
Parent issue has a patch implementing this
> AbstractRebaseDiff: Implement refined conflict resolution for addExistingNode
> conflicts
> ---------------------------------------------------------------------------------------
>
> Key: OAK-1574
> URL: https://issues.apache.org/jira/browse/OAK-1574
> Project: Jackrabbit Oak
> Issue Type: Sub-task
> Components: core
> Reporter: Michael Dürig
> Assignee: Michael Dürig
> Fix For: 0.20
>
>
> Implement refined conflict resolution for addExistingNode conflicts as
> defined in the parent issue for the {{AbstractRebaseDiff}}.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
