sync: upstream dev 2026-08-01 - #2
Merged
Merged
Conversation
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Test User <test@test.com>
Co-authored-by: Test User <test@test.com>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Frank <frank@anoma.ly>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
…… (#37696) Co-authored-by: liqiping <liqiping@msh.team> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Dax Raad <d@ironbay.co>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
…8-01 # Conflicts: # .github/workflows/publish.yml
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
20 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.
First successful upstream sync since the fork was created.
Merges 220 commits from upstream anomalyco/opencode
dev(300 files). Transform anchor assertions pass.Two blockers were fixed to get here:
github.repository == 'anomalyco/opencode'). Upstream edits them constantly, so each edit arrived asmodify/deleteand stopped the merge.merge=ourscan't help — git never invokes a merge driver for modify/delete. Sync now keeps our deletion for.github/workflows/**and only there; any other conflict still fails for a human.fpm: [legacyDesktopEntryFpm]→fpm: [metainfoFpm(appId), legacyDesktopEntryFpm]. We want neither —metainfoFpmresolves toresources/worklyn.understudy.metainfo.xml, which doesn't exist, so fpm would fail on a missing file. The transform strips the array, giving byte-identical output to before (fpm: []).Note: the workflow's own
gh pr createstill fails withResource not accessible by integrationdespite org and repo both allowing Actions to create PRs — this PR was opened manually. The branch push works, so sync is otherwise functional.