Details
-
Improvement
-
Status: Closed
-
Minor
-
Resolution: Fixed
-
None
Description
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.