Skip to content

docs(claude): merge main into v3 once, at the v3.0.0 cut - #583

Merged
adityamukho merged 1 commit into
mainfrom
docs/v3-merge-policy-main
Oct 14, 2026
Merged

adityamukho merged 1 commit into
mainfrom
docs/v3-merge-policy-main

Conversation

@adityamukho

Copy link
Copy Markdown
Collaborator

main now only gets backports of fixes that land on v3 first, so routine main→v3 merges bring no code and resolve every source conflict to v3's side; with the streaming engine (#473) rewriting the executor and storage reads, those conflicts only grow. CLAUDE.md now says: no routine merges, shared CI/workflow changes go to both branches as separate PRs, and one main→v3 merge just before the v3.0.0 cut keeps the cut a fast-forward and brings over the v2.0.x CHANGELOG sections.

🤖 Generated with Claude Code

https://claude.ai/code/session_01U611mBGbkSqJeSwNz2xd7s

@codecov

codecov Bot commented Oct 14, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@adityamukho
adityamukho merged commit d3e5ad1 into main Oct 14, 2026
22 checks passed
@adityamukho
adityamukho deleted the docs/v3-merge-policy-main branch October 14, 2026 03:26
Sign up for free to 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.

1 participant