Add safe Windows pull preflight workflow - #119
Merged
1lck merged 4 commits intoAug 17, 2026
Merged
Conversation
yangboxuan726
force-pushed
the
feat/windows-git-pull-preflight
branch
2 times, most recently
from
August 17, 2026 02:58
0b88e0c to
a6cf441
Compare
yangboxuan726
force-pushed
the
feat/windows-git-pull-preflight
branch
from
August 17, 2026 03:23
a6cf441 to
d80e9d7
Compare
yangboxuan726
marked this pull request as ready for review
August 17, 2026 03:47
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
ffOnlywhen only the upstream is ahead; require an explicit Merge, Rebase, or safe-default Cancel choice when histories diverge.User impact
Pull no longer relies on stale remote refs or implicit Git reconciliation settings. All visible Source Control entry points share busy/deduplication state, error text, strategy selection, and a complete working-tree/history/refs/remotes refresh.
Validation
bun run typecheck.\scripts\verify-windows-boundaries.ps1.\scripts\build-windows.ps1 -Configuration Releasecargo test --manifest-path windows/tauri/src-tauri/Cargo.toml(36 passed)git diff --checkUI
Actual Windows Tauri runtime against a real divergent temporary repository. Source Control shows a clean working tree, local ahead 2 / remote ahead 1, and the explicit Cancel / Rebase / Merge choice.