Skip to content

docs: sync the docs fixes that only landed on main into develop - #673

Merged
ajianaz merged 1 commit into
developfrom
docs/sync-main-docs-to-develop
Oct 16, 2026
Merged

ajianaz merged 1 commit into
developfrom
docs/sync-main-docs-to-develop

Conversation

@ajianaz

@ajianaz ajianaz commented Oct 16, 2026

Copy link
Copy Markdown
Collaborator

What

Copy the docs fixes that only exist on main into develop: docs/cli-reference.md (+7), docs/code-intelligence.md (+23/-10) and docs/configuration.md (+25/-6). They come from three docs-only commits made on main (a2056ab full audit fixes, afa5c15, 80327d0 impact-depth guidance) that develop never received. After this PR the whole tree of develop equals main (git diff origin/main is empty).

Why

develop has linear history required, so main cannot be merged back into it with a merge commit; a content sync by PR is the only way. Without it the next develop to main release would carry stale docs and the two branches keep drifting.

Testing

  • Verified that develop did not touch these three files since the common ancestor, so nothing is overwritten; main's copies already contain the docs edits from this release (agent mode rows, include_tests, max_findings 50).
  • Spot-checked against the code: bundling defaults max_chars_per_group: 60000 and strategy: smart | flat match src/engine/bundling/types.rs.
  • After the change git diff --stat origin/main shows no differences. Docs only; CI includes the website build.

Signed-off-by: ajianaz <ajianaz@users.noreply.github.com>
@ajianaz
ajianaz merged commit 62c6767 into develop Oct 16, 2026
14 checks passed
@ajianaz
ajianaz deleted the docs/sync-main-docs-to-develop branch October 16, 2026 03:08
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