Synced fork with upstream v1.0.147 #122
Closed
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
Comment out the plugin entry in opencode.jsonc
Resolved conflicts: - .github/workflows/publish.yml: Keep ours (deleted - fork-specific) - .opencode/opencode.jsonc: Accept upstream (added commented plugin line) - bun.lock: Regenerated - packages/desktop/src/context/global-sync.tsx: Merged both (upstream's new import pattern + our Command type) - packages/desktop/src/context/layout.tsx: Merged both (upstream's batch/produce imports + our theme/font features) - packages/desktop/src/context/sync.tsx: Keep ours (extra load functions) - script/publish.ts: Merged both (our fork-specific changes + upstream's release id output)
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Comment |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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
Successfully resolved upstream merge conflicts and synced the fork with upstream sst/opencode v1.0.147:
Resolved Conflicts:
.github/workflows/publish.yml.opencode/opencode.jsoncbun.lockpackages/desktop/src/context/global-sync.tsxpackages/desktop/src/context/layout.tsxpackages/desktop/src/context/sync.tsxscript/publish.tsResults:
Closes #120
opencode session | github run