[jira] [Commented] (OAK-2673) Resolve add-add, delete-delete merge conflict for empty hidden docs

[ https://issues.apache.org/jira/browse/OAK-2673?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14736727#comment-14736727 ] Vikas Saurabh commented on OAK-2673: [~mreutegg], since OAK-2929 is now resolved can we enable this by

[jira] [Commented] (OAK-2673) Resolve add-add, delete-delete merge conflict for empty hidden docs

[ https://issues.apache.org/jira/browse/OAK-2673?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14564209#comment-14564209 ] Vikas Saurabh commented on OAK-2673: Please note, using this feature is unsafe due to

[jira] [Commented] (OAK-2673) Resolve add-add, delete-delete merge conflict for empty hidden docs

[ https://issues.apache.org/jira/browse/OAK-2673?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14390672#comment-14390672 ] Vikas Saurabh commented on OAK-2673: I tried a local run with/without fix where a script

[jira] [Commented] (OAK-2673) Resolve add-add, delete-delete merge conflict for empty hidden docs

[ https://issues.apache.org/jira/browse/OAK-2673?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14386337#comment-14386337 ] Marcel Reutegger commented on OAK-2673: --- Thanks for the patch. I have some suggestions