Sessions - improve merge skill + a minor fix#307657
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Sessions built-in merge skill documentation to provide a more explicit, step-by-step merge workflow (including conflict handling and validation), and makes a small observable implementation change in the Sessions Changes view model.
Changes:
- Expanded
mergeskill instructions with explicit guidelines, merge/conflict steps, and post-merge validation commands. - Updated
ChangesViewModelto computeactiveSessionRepositoryStateObsusingderived(...)instead ofderivedOpts(...).
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/vs/sessions/skills/merge/SKILL.md |
Rewrites/expands the merge skill workflow, adding detailed steps for merging via the main worktree and validating the result. |
src/vs/sessions/contrib/changes/browser/changesView.ts |
Adjusts how the active session repository state observable is derived. |
justschen
approved these changes
Apr 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.