feat: harden File Provider conflict resolution - #18
Open
OpenCow42 wants to merge 2 commits into
Open
Conversation
OpenCow42
marked this pull request as ready for review
August 2, 2026 12:28
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
file_idwithIf-MatchAutomatic policy
.deletionRejected; 404 is idempotent successUser intervention that remains
.failOnConflict: reveal/export the retained copy and choose or merge versionsResidual safety findings
The normative register is
doc/CONFLICT_RESOLUTION_TRUTH_TABLE.md. Open findings are:Package dependency
81014d32428b2f367c74c7f1616793c7a5b2ba01; it no longer depends on a feature branch.Validation
potassiumChannel swift test: 558 tests passed before package mergebuild-for-testingpassed against merged potassiumChannel revision81014d3plutil -lint Config/potassiumProviderFileProviderInfo.plistandgit diff --checkpassedValidation limitations