Skip to content

chore: back-merge main → develop after v0.9.0 promote (#266) - #318

Merged
saadqbal merged 2 commits into
developfrom
chore/back-merge-main-to-develop-2026-07-14
Jul 14, 2026
Merged

chore: back-merge main → develop after v0.9.0 promote (#266)#318
saadqbal merged 2 commits into
developfrom
chore/back-merge-main-to-develop-2026-07-14

Conversation

@saadqbal

@saadqbalsaadqbal commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

Reconciles ancestry after the #266develop → main promote so the next promote PR doesn't go CONFLICTING (the recurring release-drift issue — main's promote/merge commits accrue outside develop's ancestry).

  • Zero content change: main carries no unique code, only the promote merge commit. Verified the merge tree == origin/main tree == origin/develop tree (90e44961…).
  • Brings the promote merge commit into develop's history.

Nothing to test — the working tree is byte-identical to current develop.

🤖 Generated with Claude Code


Note

Low Risk
No file or behavioral changes; merge commit for branch ancestry only.

Overview
Git-history only: merges main back into develop after the v0.9.0 promote (#266) so the next develop → main promote does not hit recurring ancestry/CONFLICTING drift from promote commits living only on main.

There is no application or config diff—the working tree matches current develop/main (per PR verification). This only adds the promote merge commit to develop's history.

Reviewed by Cursor Bugbot for commit c289f56. Bugbot is set up for automated code reviews on this repo. Configure here.

main - > enhance CLI features and tests
Reconcile ancestry so the next develop→main promote doesn't go CONFLICTING.
main carries no unique code (only the promote merge commit); the tree is
unchanged.
@saadqbalsaadqbal self-assigned this Jul 14, 2026
@LukasWodka

Copy link
Copy Markdown
Contributor

👋 Heads-up — Code review queue is at 55 / 30

Above the WIP limit. The team convention is to review existing PRs before opening new work.

Open PRs currently in Code review (oldest first):

  • averaging-service#181 — feat(weights): normalize-on-read — mixed cycles average instead of rejecting (SEC-03 §8 step 2) · author: @shujaatTracebloc · no reviewer assigned
  • averaging-service#182 — feat(weights): averaging writes SafeTensors (TF + PyTorch) — SEC-03 §8 step 4 · author: @shujaatTracebloc · no reviewer assigned
  • backend#1079 — feat(global_meta): edge dataset_meta exposure + attributes contract at ingest (#924 G4a) · author: @divyasinghds · no reviewer assigned
  • backend#1086 — docs(rfc): SafeTensors weight-format migration — SEC-03 Phase 1 (RFC 0004) · author: @shujaatTracebloc · no reviewer assigned
  • backend#1093 — chore(deps): bump django from 5.2.14 to 5.2.15 · author: @dependabot · no reviewer assigned
  • backend#1095 — feat(experiment): configurable preprocessing knobs incl. tabular scaler — RFC 0003 L1 + L1b (#1094) · author: @LukasWodka · no reviewer assigned
  • backend#1100 — fix(boot): pin SDK install to tracebloc==0.11.2, drop 404 dev line (#1098) · author: @LukasWodka · reviewer: @saqlainsyed007
  • backend#1105 — perf(api): query micro-fixes — notifications N+1, cached data_scientist, composite index, sampling (#975) · author: @aptracebloc · no reviewer assigned
  • backend#1108 — test(api): CLI response-shape contract fixtures for the 9 CLI endpoints (WS-D.2) · author: @LukasWodka · reviewer: @saadqbal
  • cli#300 — chore(release): drop the Homebrew tap job + install.tracebloc.io promise · author: @LukasWodka · reviewer: @saadqbal

Pull from review before opening new work. (This is a nudge from the kanban WIP check, not a block.)

@saadqbal
saadqbal merged commit 078cca2 into developJul 14, 2026
21 checks passed
@saadqbal
saadqbal deleted the chore/back-merge-main-to-develop-2026-07-14 branch July 14, 2026 12:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@saadqbal@LukasWodka