[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-06-13 Thread Alex Parvulescu (JIRA)
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16047921#comment-16047921 ] Alex Parvulescu commented on OAK-3381: -- just to clarify, latest changes to the api cons

[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-06-09 Thread Alex Parvulescu (JIRA)
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16044504#comment-16044504 ] Alex Parvulescu commented on OAK-3381: -- bq. Once the remaining subtasks of OAK-1553 are

[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-06-09 Thread JIRA
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16044201#comment-16044201 ] Michael Dürig commented on OAK-3381: Right, {{addExistingNode}} will only be called shou

[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-06-09 Thread Alex Parvulescu (JIRA)
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16044167#comment-16044167 ] Alex Parvulescu commented on OAK-3381: -- Writing test I realised that the {{addExistingN

[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-06-08 Thread angela (JIRA)
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16042974#comment-16042974 ] angela commented on OAK-3381: - like the appoach! so far i only spotted minor issues: * {{Annota

[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-06-08 Thread Alex Parvulescu (JIRA)
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16042977#comment-16042977 ] Alex Parvulescu commented on OAK-3381: -- thanks for the feedback! I've cleaned-up the j

[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-06-08 Thread JIRA
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16042716#comment-16042716 ] Michael Dürig commented on OAK-3381: Nice! I like how {{ThreeWayConflictHandler}} is the

[jira] [Commented] (OAK-3381) Provide Common Ancestor To ConflictHandler

2017-05-23 Thread JIRA
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16020997#comment-16020997 ] Michael Dürig commented on OAK-3381: Looks good from a POC point of view. That is, AFAIC