Repository navigation
chore(sync): merge pingdotgg/t3code main - #507
Merged
Merged
Conversation
…anup (pingdotgg#33664) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#33663) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#33674) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#33678) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…ingdotgg#24599) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/mobile/app.config.ts
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
 |
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.
🤖 Merge of pingdotgg/t3code main (7 commits) into fork main.
What upstream brought
awaitingApprovalandapprovalAnnounced, and a newplaceholderfield onPullRequestCheck.Conflicts
apps/mobile/app.config.ts: kept the fork scheme list[variant.scheme, variant.threadLinkScheme]and took the upstream default version2.3.0.Auto-merged files that both sides changed:
pullRequestWatch.ts,PullRequestWatchReactor.ts,Orchestrator.ts,pullRequest.ts,source-control.md. The fork remark filter, wake message prefix and held-wake logging stay. They do not overlap the upstream approval logic. The PR watch tests pass.Checks
checks.py: typecheck, migrations, format, lint, knip, workflows pass.GitVcsDriverCore.test.tsandDesktopLinuxUrlHandler.test.ts, which fail on macOS only (/privatepath and a case-insensitive file system). The merge does not change these files. Fork CI runs them on Linux.Review: none, merge agent rule.