Marcel Reutegger created OAK-1974:
-------------------------------------
Summary: Fail fast on branch conflict
Key: OAK-1974
URL: https://issues.apache.org/jira/browse/OAK-1974
Project: Jackrabbit Oak
Issue Type: Improvement
Components: core, mongomk
Reporter: Marcel Reutegger
Assignee: Marcel Reutegger
Priority: Minor
The current MongoMK implementation performs retries when it runs into merge
conflicts caused by collisions. It may be possible to resolve a conflict by
resetting
the branch back to the state as it was before the merge and re-run the commit
hooks again.
This helps if the conflict was introduced by a commit hook. At the moment the
retries
also happen when the conflict was introduced before the merge. In this case, a
retry
is useless and the commit should fail fast.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
