dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

story-kit: create 205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code

Browse Source
This commit is contained in:
Dave
2026-02-26 13:49:52 +00:00
parent 181e49e0ec
commit 9c0df59db0
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.story_kit/work/1_upcoming/205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code.md
View File

@@ -51,3 +51,4 @@ Mergemaster should squash-merge feature branch code onto master before marking s
- [ ] If the squash merge results in conflicts, the story is NOT moved to done — it stays in 4_merge with an error reported - [ ] If the squash merge results in conflicts, the story is NOT moved to done — it stays in 4_merge with an error reported
- [ ] If the squash merge results in an empty diff (code already on master), the story is moved to done but the feature branch is cleaned up - [ ] If the squash merge results in an empty diff (code already on master), the story is moved to done but the feature branch is cleaned up
- [ ] Stale .story_kit/merge_workspace directories are cleaned up before attempting a new merge - [ ] Stale .story_kit/merge_workspace directories are cleaned up before attempting a new merge
- [ ] The mergemaster agent must use MCP actions (merge_agent_work, move_story_to_merge, etc.) to drive its process — it should never manually move story files between pipeline stages or mark stories as done by direct file manipulation