Fix sync issue - #38
Merged
Merged
Conversation
Fetch before classifying work, exclude only byte-, mode-, index-, and commit-identical remote residue, and adopt verified remote blobs into the merge index. Prevent redundant LFS uploads and commits while preserving missing, edited, staged, and binary content.
Resolve both Electron and Code executable names within macOS app bundles, preserve valid supplied paths, and report the underlying startup error. Add six regression checks for legacy and current names, platform isolation, and invalid cached paths. Validated with all 241 tests and a successful vsce package run using cached VS Code 1.135.0.
Adopt verified remote-equivalent files before fast-forwarding, pin analyzed merge heads through completion, and stage valid LFS pointers without hydrating media. Cover 1,500-file recovery, stale merge snapshots, and pointer-only staging.
Add a mergeSnapshot property to SCMManager to ensure that the conflict list is verified against the exact commits during merge resolution. Update assertMergeSnapshot to abort merges when local or remote history changes, preventing silent reverts. Enhance unit tests to validate the forwarding of merge snapshots and uploaded LFS files during sync operations.
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.
fix: recover interrupted syncs without recommitting remote files
Summary
Prevent files left by an interrupted merge from being mistaken for new local work. Frontier now verifies remote-equivalent files against Git commits, the index, file mode, and actual disk bytes before excluding them from local commits.
The corresponding Codex PR consumes Frontier’s authoritative conflict list and carries the analyzed Git snapshot through merge completion.
Changes
ElectronandCodeexecutable names in cached macOS VS Code installations.Test Checklist