Skip to content

chore: merge upstream/main into the fork - #14

Merged
carlosfelgarcia merged 462 commits into
mainfrom
chore/summarize-upstream-changes
Nov 12, 2026
Merged

carlosfelgarcia merged 462 commits into
mainfrom
chore/summarize-upstream-changes

Conversation

@carlosfelgarcia

Copy link
Copy Markdown
Owner

Summary

  • Merges upstream/main (461 commits) into chore/summarize-upstream-changes, bringing the fork up to date.
  • Resolves three conflicts, all in apps/web:
    • CommandPalette.tsx: keeps upstream's selectActiveRightPanel import alongside the fork's projectIssueRepositories import.
    • rightPanelStore.ts: keeps the fork's setIssuesView and upstream's settlePullRequestReveal.
    • SettingsPanels.tsx: uses upstream's translatable "Working section" description with the fork's inbox-order wording.
  • Reinstalls dependencies for the packages upstream added.

Testing

  • Typecheck passes with no errors for apps/web, packages/contracts, packages/client-runtime, apps/server, apps/mobile, and apps/desktop.
  • vp test run passes for the right panel store, Issues logic, command palette logic, Settings panels, and settings search (188 tests).
  • vp fmt, vp lint, and vp run knip:check pass on the merge commit.
  • Not run: the full test suite, and a manual check of the app in a client.
  • Not run: the translation wrapping for the fork's new strings. The fork does not need translations.

Model and harness: Claude Haiku 5.5 via Claude Code.

juliusmarminge and others added 30 commits November 11, 2026 11:57
juliusmarminge and others added 26 commits November 11, 2026 16:21
…tream-changes

# Conflicts:
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/settings/SettingsPanels.tsx
#	apps/web/src/rightPanelStore.ts
@carlosfelgarcia
carlosfelgarcia merged commit 9751854 into main Nov 12, 2026
6 of 18 checks passed
@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:XXL labels Nov 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.