Skip to content

chore: back-merge main → develop after #319 promote - #320

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

chore: back-merge main → develop after #319 promote#320
saadqbal merged 3 commits into
developfrom
chore/back-merge-main-to-develop-319

Conversation

@saadqbal

@saadqbalsaadqbal commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

Reconciles ancestry after the #319develop → main promote so the next promote PR stays clean (recurring release-drift fix).

  • Zero content change: verified merge tree == origin/main == origin/develop (0766b885…). main carries only promote merge commits, no unique code.

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

🤖 Generated with Claude Code


Note

Low Risk
Empty or identity merge with no code delta; risk is limited to git branch alignment, not runtime behavior.

Overview
No application code changes — this PR only updates branch history so develop includes the promote merge commits from main after #319.

The goal is to keep the next develop → main promote PR free of spurious merge noise. The description states the resulting tree matches current main and develop (commit 0766b885…).

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

main - > enhance CLI features and tests
main -> Update Go toolchain and x/net to address vulnerabilities and add CI gate
Keep ancestry reconciled so the next develop→main promote stays clean.
main carries no unique code; tree unchanged.
@LukasWodka

Copy link
Copy Markdown
Contributor

👋 Heads-up — Code review queue is at 54 / 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 cc3695e into developJul 14, 2026
22 checks passed
@saadqbal
saadqbal deleted the chore/back-merge-main-to-develop-319 branch July 14, 2026 13:02
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