Repository navigation
Conversation
… not the latest is a retryable conflict Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
When an action set fails to apply on the latest version, the commit now checks whether it applies on the version it read. If it does, a concurrent commit broke it, so the failure is returned as a retryable commit conflict instead of the original error. If it fails at its read version too, the original error is returned unchanged.
This lets the conflict check rely on apply for what apply already validates (a missing fragment, field or base), instead of restating those checks.
Evidence
io::commit::tests::test_failed_apply_is_retryable_only_if_it_applies_at_read_version, which runs on an in-memory dataset:applies_at_read_versionexpectsRetryableCommitConflictat the latest version.fails_at_read_version_tooexpects the originalInvalidInput.The first case fails with the check disabled.
Merge Risk
Door: two-way. Only the error kind returned for a failed action-set apply changes.
Blast Radius: concurrency (commit retry of action sets).
🤖 Generated with Claude Code