Basically every other complaint in this thread is that editing is impossible because everything is reverted. Your issue seems like an impossible one to cleanly solve