test: validate /resolve fork push (throwaway, do not merge)

[yiliang114]

Throwaway PR to validate that @qwen-code /resolve (PR #5870) can force-push a conflict resolution back to a fork branch via maintainer-edits. Safe to close. Seeds a one-line conflict in docs/users/configuration/settings.md.

[qwen-code-ci-bot]

Hi @yiliang114 — this PR is missing the required template headings. The body should follow the PR template and include at minimum: What this PR does, Why it's needed, Reviewer Test Plan (with How to verify, Evidence, Tested on), Risk & Scope, Linked Issues, and the 中文说明 section.

Even for throwaway/test PRs, the template helps reviewers understand intent and scope quickly. Please update the body to match the template structure.

中文说明

@yiliang114 你好 — 这个 PR 缺少必需的模板章节。PR 正文应遵循 PR 模板，至少包含：What this PR does、Why it's needed、Reviewer Test Plan（含验证方法、证据、测试平台）、Risk & Scope、Linked Issues 以及中文说明部分。

即使是临时测试 PR，模板也能帮助审查者快速理解意图和范围。请按模板结构更新正文。

— Qwen Code · qwen3.7-max

[qwen-code-dev-bot]

Qwen Code resolved the merge conflicts, but pushing to yiliang114/qwen-code failed. The resolved diff is attached as the qwen-resolve-pr-5871 artifact on the workflow run.

Conflict Resolution Summary — PR #5871

Conflicted file

docs/users/configuration/settings.md — telemetry settings table

What each side changed

• PR branch (HEAD): Inserted a test marker (resolve-fork-push test marker — safe to delete) into the telemetry.enabled description row. This was the intentional conflict seed for validating the /resolve fork-push workflow.
• origin/main: Added a new telemetry.sensitiveSpanAttributeMaxLength row to the table, added the same field to the JSON example, and widened the table column formatting (extra space in header, extra dash in separator, padded Default column).

Resolution

Kept origin/main's version entirely:

1. Dropped the PR's test marker text — it was explicitly labelled "safe to delete".
2. Kept the new telemetry.sensitiveSpanAttributeMaxLength row and its JSON example entry.
3. Accepted main's wider table formatting so the Markdown renders correctly.

Only the conflicted file was modified. No other files were touched.

[qwen-code-dev-bot]

Qwen Code resolved the merge conflicts, but pushing to yiliang114/qwen-code failed. The resolved diff is attached as the qwen-resolve-pr-5871 artifact on the workflow run.

Conflict Resolution Summary — PR #5871

Conflict

File: docs/users/configuration/settings.md

Both the PR branch and origin/main modified the telemetry settings table in the same region.

PR side (HEAD)

• Appended a test marker (resolve-fork-push test marker — safe to delete) to the telemetry.enabled description.
• Used the older, narrower table column widths.

Main side (origin/main)

• Reformatted the entire table to wider column widths (45-char setting column, 11-char default column).
• Added a new row: telemetry.sensitiveSpanAttributeMaxLength (a new setting with type number, default 1048576).

Resolution

Adopted main's table structure (wider columns + the new sensitiveSpanAttributeMaxLength row) and incorporated the PR's test marker text into the telemetry.enabled description line. This preserves both:

1. Main's new telemetry setting documentation.
2. The PR's intentional test marker for validating the /resolve fork-push workflow.

Result

• 1 file modified: docs/users/configuration/settings.md
• Net diff vs main: 1 line changed (the test marker on telemetry.enabled)
• Commit: merge: resolve conflict in settings.md telemetry table

[qwen-code-ci-bot]

No review findings. Downgraded from Approve to Comment: CI still running.

— qwen3.7-max via Qwen Code /review

[qwen-code-dev-bot]

Qwen Code resolved the merge conflicts, but could not push to yiliang114/qwen-code: resolving merges the base branch in, which includes its .github/workflows/** changes, and GitHub blocks a token without the workflow scope from updating workflow files. A maintainer needs to grant that scope to the push bot (classic PAT: check workflow; fine-grained PAT: Workflows → Read and write), then re-run /resolve. The resolved diff is attached as the qwen-resolve-pr-5871 artifact on the workflow run.

Conflict Resolution Summary — PR #5871

Conflicted file

docs/users/configuration/settings.md — telemetry settings table (lines 503–524)

What conflicted

Both branches modified the same Markdown table under the #### telemetry section:

• HEAD (PR branch): Injected a test marker string (resolve-fork-push test marker — safe to delete) into the telemetry.enabled description. No other changes to the table structure.
• origin/main: Reformatted the table (wider column separators to accommodate a new row), and added a new setting telemetry.sensitiveSpanAttributeMaxLength (type number, default 1048576).

How it was resolved

Took origin/main's version entirely:

1. Discarded the test marker — the PR title itself says "throwaway, do not merge"; the marker was intentionally seeded to create a conflict for validation purposes.
2. Kept the new telemetry.sensitiveSpanAttributeMaxLength setting — a legitimate addition from main.
3. Kept origin/main's table formatting — wider column widths to accommodate the new row.

No other files conflicted. The remaining 144 files were auto-merged cleanly by git.

Commit

merge: resolve conflict in settings.md telemetry table

Discarded the test marker injected into telemetry.enabled description
by the PR branch. Kept origin/main's version which includes the new
telemetry.sensitiveSpanAttributeMaxLength setting and clean formatting.

[qwen-code-dev-bot]

Qwen Code resolved the merge conflicts and pushed the branch update.

Conflict Resolution Summary — PR #5871

Conflicted file

docs/users/configuration/settings.md (lines 503–524)

What conflicted

The PR branch (test-resolve-fork-push) seeded a deliberate conflict in the telemetry settings table:

• HEAD (ours): Modified the telemetry.enabled description to include the text (resolve-fork-push test marker — safe to delete). This was an intentional test marker from commit 39c81ee19 ("test: seed a conflict to validate /resolve fork push"). The table also lacked the new telemetry.sensitiveSpanAttributeMaxLength row.
• origin/main (theirs): Had the original clean telemetry.enabled description and included a new row for telemetry.sensitiveSpanAttributeMaxLength (added in a main-side commit).

Resolution

Accepted main's version for the conflicted region:

1. Discarded the test marker — the text (resolve-fork-push test marker — safe to delete) was explicitly labeled as safe to delete and was the only change from the PR branch.
2. Kept the new telemetry.sensitiveSpanAttributeMaxLength row from main, which adds a configurable max-length setting for sensitive span attributes.

Verification

• No conflict markers remain in the file.
• The resolved file matches origin/main exactly (the PR branch's only unique change was the throwaway test marker, which was correctly discarded).
• Final diff git diff origin/main is empty — expected for this throwaway PR.
• No unrelated files were modified.

[yiliang114]

Test complete — fork /resolve push validated end-to-end (the bot pushed the resolution to the fork branch and the PR went MERGEABLE). Closing this throwaway PR.