Skip to content

Sessions - rename the merge skill#307382

Merged
lszomoru merged 1 commit intomainfrom
lszomoru/total-crab
Apr 2, 2026
Merged

Sessions - rename the merge skill#307382
lszomoru merged 1 commit intomainfrom
lszomoru/total-crab

Conversation

@lszomoru
Copy link
Copy Markdown
Member

@lszomoru lszomoru commented Apr 2, 2026

No description provided.

Copilot AI review requested due to automatic review settings April 2, 2026 10:01
@lszomoru lszomoru enabled auto-merge (squash) April 2, 2026 10:01
@lszomoru lszomoru self-assigned this Apr 2, 2026
@lszomoru lszomoru added this to the 1.115.0 milestone Apr 2, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Renames the Sessions built-in “merge” skill identifier by updating the skill’s SKILL.md frontmatter, aligning the declared skill name with its folder name under vs/sessions/skills/.

Changes:

  • Updated the built-in merge skill frontmatter name from merge-changes to merge.
Comments suppressed due to low confidence (1)

src/vs/sessions/skills/merge/SKILL.md:3

  • Renaming the built-in skill to merge needs corresponding updates wherever the skill name is referenced. In particular, SessionsAICustomizationWorkspaceService._skillUIIntegrations still registers the Merge toolbar integration under 'merge-changes' (src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.ts:280), so the Merge button integration will no longer match this skill name. Update that mapping to use merge (or register both keys for backward compatibility).

@lszomoru lszomoru merged commit 1c46f07 into main Apr 2, 2026
23 checks passed
@lszomoru lszomoru deleted the lszomoru/total-crab branch April 2, 2026 12:31
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.

3 participants