recovering from merge conflict exceptions

[Alex Benenson]

Hi all

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


-- 
Alex Benenson