Merge main into feat/add-t0 (resolve uv.lock conflict)#1
Merged
GeoffNN merged 6 commits intoJun 16, 2026
Conversation
Resolve uv.lock conflict by taking main's resolution (tirex>=0.1.1 bump, torchvision dropped, xlstm added) plus this branch's tfc-t0 addition. Verified content-identical to a full `uv lock` regeneration; `uv lock --check` passes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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
3 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.
Merges the current
TimeCopilot/timecopilotmaininto this branch to clear theuv.lockconflict blocking TimeCopilot#348.What conflicted
Only
uv.lock.pyproject.tomlandtirex.pyauto-merged cleanly. The conflict came from main's tirex bump (TimeCopilot#346), which changed the resolution (timecopilot-tirex→>=0.1.1unconditional,torchvisiondropped,xlstmadded) while this branch independently addedtfc-t0.Resolution
Union of both sides: main's resolution plus this branch's
tfc-t0. To avoid a ~6,600-line reformat (the committed lock uses an older uv serialization that current uv rewrites wholesale),tfc-t0was grafted onto main's lock in the existing compact format — a clean +21-line diff (one[[package]]block + 2 dependency references).Verification
uv lockregeneration as TOML → content-identical.uvx uv@latest lock --check→ exit 0 (lock is up-to-date; CI won't re-resolve).Merging this PR into
feat/add-t0makes TimeCopilot#348 mergeable intomainagain.🤖 Generated with Claude Code