Repository navigation
chore: sync upstream pingdotgg/t3code (conflicts) - #37
Conversation
pingdotgg#17681) Co-authored-by: Claude Opus 5.5 <[email protected]>
… the PR (pingdotgg#17729) Co-authored-by: Claude Opus 5.5 <[email protected]>
…editor is a Windows command shim (pingdotgg#17749) Co-authored-by: Claude Opus 5.5 <[email protected]>
) Co-authored-by: Claude <[email protected]>
…utput (pingdotgg#17376) Co-authored-by: Claude Opus 5.5 <[email protected]>
… again (pingdotgg#17379) Co-authored-by: Claude Opus 5.5 <[email protected]>
…its thread (pingdotgg#17327) Co-authored-by: Claude Opus 5.5 <[email protected]>
…a check is still going (pingdotgg#17344) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Yash Singh <[email protected]>
…ingdotgg#17496) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#17223) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Yash Singh <[email protected]>
…17050) Co-authored-by: Julius Marminge <[email protected]>
…#17027) Co-authored-by: Julius Marminge <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <[email protected]>
…gg#18352) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#16271) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
|
@copilot resolve the merge conflicts on this pull request by merging Rules:
Conflicting files:
Generated by Claude Code |
|
@copilot resolve the merge conflicts on this branch. |
|
@copilot resolve the merge conflicts on this pull request by merging Rules:
Conflicting files:
|
Co-authored-by: LadyBluenotes <[email protected]>
Resolved and pushed the merge as
Merged |
Nightly sync of
pingdotgg/t3codeatc0c495e4dc12bbb0bb44387657a5682661cdd05cdid not merge automatically.Conflicting files:
apps/mobile/src/features/usage/usageProviders.tsapps/server/src/provider/builtInDrivers.tsapps/server/src/serverSettings.tsapps/web/src/components/usage/UsageProviderChart.test.tsapps/web/src/components/usage/usageProviders.tsdocs/user/usage.mdpackage.jsonpackages/contracts/src/usage.tsResolve the conflicts on this pull request, or merge
sync/upstreamintomainlocally and push. The next nightly run closes this oncemaincontains upstream.