Fixed issue #505: Delete (keep local) results in commit error