Skip to content

chore: rebase TickTick takeover branch onto main (resolves #29289 conflict) - #29627

Merged
buluoray merged 278 commits into
kirodotdev:feat/connections-ticktickfrom
martchellop:feat/connections-ticktick-sync
Nov 4, 2026
Merged

buluoray merged 278 commits into
kirodotdev:feat/connections-ticktickfrom
martchellop:feat/connections-ticktick-sync

Conversation

@martchellop

@martchellop martchellop commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Resolves the merge conflict in #29289: _PACKAGE_LINE_BUDGET in test/test_security_gate_liveness.py set to main + 1 (currently 34_353) with both #: notes kept. The change itself is byte-identical to c15ea302c4 rebased (same patch-id as fork PR #26407's head; 13 files, +108/−15); the only edit beyond the merge is the budget line. Merging this into the takeover branch makes #29289 mergeable; no review needed beyond the budget line. Fork PR #26407 carries the same tree.

This is c15ea302c4 plus a merge of main, so it fast-forwards; alternatively force-push #26407's head (currently 38cfdbd71e) over this branch for a single-commit shape. The branch is re-merged whenever main raises the budget again, so the SHA here can move; the shape does not.

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fork Pull request from a fork (external contributor)

Projects

None yet

Development

Successfully merging this pull request may close these issues.