Thanks to visit codestin.com
Credit goes to github.com

Skip to content

docs: correct broken CLI commands and flags from drift sweep (#28098) (conflicts) - #28163

Closed
github-actions[bot] wants to merge 1 commit into
release/2.29from
backport/28098-to-2.29
Closed

docs: correct broken CLI commands and flags from drift sweep (#28098) (conflicts)#28163
github-actions[bot] wants to merge 1 commit into
release/2.29from
backport/28098-to-2.29

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Backport of #28098

Original PR: #28098 — docs: correct broken CLI commands and flags from drift sweep
Merge commit: 58de9ab
Requested by: @nickvigilante

Warning

The automatic cherry-pick had conflicts.
Please resolve manually by cherry-picking the original merge commit:

git fetch origin backport/28098-to-2.29
git checkout backport/28098-to-2.29
git reset --hard origin/release/2.29
git cherry-pick -x -m1 58de9ab8f87e7fede0a2d83afa2644bd56a16422
# resolve conflicts, then push

The automatic cherry-pick of 58de9ab to release/2.29 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 58de9ab
@nickvigilante

Copy link
Copy Markdown
Contributor

Superseded by #28176, which is cut from the current release/2.29 tip. This branch was an empty placeholder based on an older base (it predates #28159, #28160, #28162, and #28157, which have since merged into release/2.29). The #28098 changes are backported in #28176 with conflicts resolved (kept 2.29's shell fence for the users list blocks; dropped github-to-tasks.md, which doesn't exist on 2.29). Closing in favor of #28176.

nickvigilante added a commit that referenced this pull request Aug 17, 2026
…ckport to release/2.29) (#28176)

Backport of #28098 to `release/2.29` (ESR).

Replaces the stale automated backport #28163, whose branch was an empty
placeholder based on an older `release/2.29` (the branch predates four
docs backports that have since merged: #28159, #28160, #28162, #28157).
This branch is cut from the current `release/2.29` tip and cherry-picks
`58de9ab8f87e` with `git cherry-pick -x`.

**Conflicts resolved manually:**
- `dx-data-cloud.md`, `users/index.md`: kept 2.29's `shell` fence and
applied the `coder users list --output json | jq ... | @csv > users.csv`
pipeline (same fence divergence as on `main`).
- `docs/ai-coder/github-to-tasks.md`: that page does not exist on
`release/2.29`, so its hunk is dropped. The backport touches
`scale-utility.md`, `dx-data-cloud.md`, `users/index.md`, and
`workspace-access/index.md`.

Once reviewed, #28163 can be closed in favor of this PR.

- Original PR: #28098
- Replaces: #28163
- Tracking: DOCS-651

> This PR was created with AI assistance (Coder Agents).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/v2.29 Backport PR targeting release/2.29

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant