Branch Sync Review
Branch Sync Review is a VS Code extension for reviewing incoming changes from one local branch into another with a file-by-file workflow. It is designed for cases where you want more control than a straight merge or cherry-pick, while still staying inside the editor.
Features
- Start from the command palette with
Branch Sync Review: Start
- Pick a local base branch and a local compare branch
- Review all compare-branch changes introduced since the merge base
- Decide per file:
Accept
Skip
Defer
View Diff
Merge
- Apply all decisions back into the current working tree on the selected base branch
- Default any undecided files to
Skip when Apply Decisions is pressed
- Reopen the active review session with
Branch Sync Review: Reopen Active Session
- Open
Branch Sync Review: Support Project to copy donation addresses
Workflow
- Open a Git repository in VS Code.
- Make sure the repository is already checked out on the base branch you want to receive changes.
- Make sure the working tree is clean.
- Run
Branch Sync Review: Start.
- Select the base branch.
- Select the compare branch.
- Use the review panel to make per-file decisions.
- Press
Apply Decisions when ready.
Review Decisions
Accept
Use the compare-branch version of the file.
Skip
Keep the current base-branch version of the file.
Defer
Copy raw snapshots for both sides into:
.local.deferred.data/<session-stamp>/<branch-name>/<repo-relative-path>
Binary and image files are copied as raw bytes without re-encoding.
View Diff
- Text files open in the native VS Code diff editor.
- Compare-side changed hunks show compare-branch commit metadata.
- Deleted file diffs still open, with deletion commit information in the title.
- Image files open in a custom image diff view with:
- side-by-side comparison
- an overlay slider mode
Merge
Text files can be opened in a custom merge panel where you can:
- accept base from the hunk header
- accept compare from the hunk header
- open an inline editor directly below a hunk for manual merge edits
- finish the merge and push the result back into the review session
Commands
Branch Sync Review: Start
Branch Sync Review: Reopen Active Session
Branch Sync Review: Support Project
Development
npm install
npm run compile
npm run test
Optional:
npm run lint
npm run package
Release
Build a Marketplace-ready VSIX with:
npm run package
When your VS Code Marketplace publisher is configured, publish with:
npm run publish:vsce
Limitations
- v1 supports local branches only
- apply writes into the currently checked out base-branch working tree
- merge editing is implemented in a custom webview, not the built-in VS Code merge editor
- deferred output is stored inside the repository root
Support / Donations
Donations help fund maintenance and future improvements.
Ethereum
0x94407FB147aA194D532e3e0363b3387aCE2Ed9B1
Bitcoin
bc1q29ycu4rwrqm326jde0762xzwgg80dnu5fgx37g