📖 [Docs]: Stacked pull request workflow and workspace path clarified#73
Merged
Marius Storhaug (MariusStorhaug) merged 2 commits intoJul 25, 2026
Merged
Conversation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot started reviewing on behalf of
Marius Storhaug (MariusStorhaug)
July 25, 2026 14:33
View session
There was a problem hiding this comment.
Pull request overview
This PR updates the repository’s “Ways of Working” documentation to define a deterministic stacked pull request workflow for dependent changes, and aligns agent guidance with the canonical MSX workspace paths (~/.msx/docs and ~/.msx/memory).
Changes:
- Adds a “Stacked pull requests” section documenting the lifecycle, layering rules, and merge order for stacked PRs.
- Clarifies how to express stack dependencies using existing issue hierarchy and PR description conventions.
- Updates
AGENTS.mdto point contributors/agents to the canonical workspace paths.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/docs/Ways-of-Working/Branching-and-Merging.md | Documents the stacked PR workflow (layering, readiness, refresh/retarget, merge order) alongside existing branching/merge guidance. |
| AGENTS.md | Updates workspace pointers to the canonical ~/.msx/docs and ~/.msx/memory paths. |
Marius Storhaug (MariusStorhaug)
marked this pull request as ready for review
July 25, 2026 14:35
Marius Storhaug (MariusStorhaug)
enabled auto-merge (squash)
July 25, 2026 14:35
Marius Storhaug (MariusStorhaug)
disabled auto-merge
July 25, 2026 14:50
Marius Storhaug (MariusStorhaug)
deleted the
docs-72-stacked-pull-request-workflow
branch
July 25, 2026 14:50
4 tasks
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.
Dependent changes now have one deterministic path from draft through merge, and the repository agent entry point points to the canonical MSX workspace.
New: Stacked pull request workflow
Each layer keeps its own Task issue, branch, pull request, validation, and review boundary. Branches build from the destination upward, every layer opens as a draft, only the lowest unmerged layer becomes ready, and the stack lands bottom-up.
The workflow defines how layers identify their immediate dependency, keep their diffs isolated, refresh after a dependency lands, retarget to the landed destination, and rerun validation before review.
Fixed: Canonical workspace path
The repository agent guidance now directs contributors and agents to
~/.msx/docsand~/.msx/memory, matching the workspace bootstrap and agentic-development documentation.Technical Details
src/docs/Ways-of-Working/Branching-and-Merging.mdowns the stacked pull request lifecycle alongside the existing base-branch and merge rules.AGENTS.mdreplaces the obsolete.msx/main/docsand relative.msx/memoryreferences.Related issues