Add updatedAt-based conflict resolution for pinnedExtensions#803
Draft
JonahBraun wants to merge 1 commit intomainfrom
Draft
Add updatedAt-based conflict resolution for pinnedExtensions#803JonahBraun wants to merge 1 commit intomainfrom
JonahBraun wants to merge 1 commit intomainfrom
Conversation
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.
When both local and remote modify the same pin entry during a merge, use the
updatedAttimestamp to determine the winner — the most recent change takes precedence. Stable (unpin) entries default toupdatedAt: 0so any active pin always wins over an unpin unless the unpin is newer.Part of the extension pinning project. See the architecture doc.
Changes
updatedAtfield to thePinnedExtensiontype intypes/index.d.tsresolvers.tsthat comparesupdatedAttimestamps when both sides modified the same pin entryNote
Medium Risk
Changes merge behavior for
metadata.jsonextension pin entries, which could affect how sync conflicts are resolved and potentially override a user's intended pin/unpin if timestamps are wrong or missing.Overview
Adds pin-specific conflict resolution for
meta.pinnedExtensionsduringmetadata.json3-way merges: when both ours and theirs changed the same pin entry, the version with the highestupdatedAtnow wins.Extends the project metadata type so each
pinnedExtensionsrecord includesupdatedAt(and documents that version"stable"represents an unpinned state).Written by Cursor Bugbot for commit 4f71e43. This will update automatically on new commits. Configure here.