You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by Alex Benenson <al...@gmail.com> on 2017/03/06 16:22:55 UTC

recovering from merge conflict exceptions

Hi all

How do I recover from OakMerge0004 and OakState0002 exceptions? I am
willing to lose all changes made in conflicting branches


-- 
Alex Benenson