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

Skip to content

fix(site): keep TemplateVersionEditor file tree in sync (#25068) - #26769

Merged
f0ssel merged 2 commits into
release/2.33from
backport/25068-to-2.33
Jun 27, 2026
Merged

fix(site): keep TemplateVersionEditor file tree in sync (#25068)#26769
f0ssel merged 2 commits into
release/2.33from
backport/25068-to-2.33

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Backport of #25068

Original PR: #25068 — fix(site): keep TemplateVersionEditor file tree in sync
Merge commit: 7481e1a
Requested by: @aslilac

Updates the stale backport branch with the latest release/2.33, which includes #26645 removing the emdash comments in coderd/workspaceagents.go that the lint/emdash check flagged.

f0ssel commented Jun 27, 2026

Copy link
Copy Markdown
Member

CI fix: updated stale backport branch

Failure: the lint job failed at lint/emdash, flagging two emdash comments in coderd/workspaceagents.go (a file this frontend backport does not touch).

Root cause: this backport branch was 5 commits behind release/2.33. One of those commits, #26645, refactored workspaceagents.go and removed those emdash comments. The check_emdash.sh version on release/2.33 uses a two-dot git diff origin/release/2.33 (release tip vs PR tree), so the stale branch's old pre-#26645 lines showed up as "added" emdashes.

Fix: merged the latest release/2.33 into the branch (equivalent to GitHub's "Update branch"). The effective PR diff is unchanged (still only the 4 TemplateVersionEditor files); lint/emdash now passes locally.

Generated by Coder Agents on behalf of @f0ssel.

@f0ssel
f0ssel merged commit 59d5253 into release/2.33 Jun 27, 2026
25 of 26 checks passed
@f0ssel
f0ssel deleted the backport/25068-to-2.33 branch June 27, 2026 12:54
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 27, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants