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

story-kit: remove 238_story_mergemaster_handles_merge_conflicts_by_resolving_them_automatically

Browse Source
This commit is contained in:
Dave
2026-02-28 10:23:56 +00:00
parent d40efca8c0
commit 2729e6aa8a
1 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
.story_kit/work/4_merge/238_story_mergemaster_handles_merge_conflicts_by_resolving_them_automatically.md
View File

@@ -1,42 +0,0 @@
---
name: "Mergemaster handles merge conflicts by resolving them automatically"
merge_failure: "Quality gates failed due to merge workspace infrastructure issues (not code problems). Two failures: (1) esbuild build scripts were ignored by pnpm, causing 'pnpm run build' to fail with 'Cannot find module esbuild'. The merge workspace needs 'pnpm approve-builds' run to allow esbuild scripts. (2) 'cargo test' failed because Cargo.toml was not found at the merge workspace root — the script/test runner is looking for it at .story_kit/merge_workspace/Cargo.toml which doesn't exist. The squash merge itself was clean (no conflicts), but the quality gate runner's working directory or setup for the temporary merge workspace needs fixing."
---
# Story 238: Mergemaster handles merge conflicts by resolving them automatically
## User Story
As a mergemaster agent, I want to detect and resolve merge conflicts when squash-merging feature branches, so that stories don't get stuck in the merge queue requiring manual intervention.
## Acceptance Criteria
- [ ] When merge_agent_work encounters a merge conflict, the mergemaster reads both sides of the conflict and produces a resolved file that preserves changes from both branches
- [ ] After resolving conflicts, the mergemaster runs quality gates (cargo check, cargo test, pnpm build, pnpm test) to verify the resolution is correct
- [ ] If quality gates fail after conflict resolution, the merge is reported as failed with details about what went wrong
- [ ] The mergemaster handles the common case of multiple feature branches adding to the same file (e.g. both adding tests or UI sections to the same component)
## Context
Three stories got stuck in the merge queue (2026-02-28) because the mergemaster couldn't handle conflicts:
- Stories 235, 236, 237 all modified the same files (`WorkItemDetailPanel.tsx` and its test file)
- 237 merged cleanly. 235 failed silently (empty output from `merge_agent_work`). 236 had conflicts in both component and test files.
**Conflict patterns observed:**
1. **add/add in test file**: Multiple branches created the same test file from scratch with different mock setups. Resolution: combine mock setups and keep all test suites.
2. **content conflict in component**: Both branches added different state, imports, hooks, and UI sections. Resolution: keep all additions from both sides.
3. **Placeholder list divergence**: Both branches removed different items from a shared placeholder list. Resolution: remove both since both features are now real.
**Manual resolution process:**
1. `git merge --squash --no-commit feature/story-{id}`
2. Read conflicted files, understand both sides
3. Write resolved files combining both feature additions
4. Run `tsc --noEmit` and `pnpm test` to verify
5. Stage, commit, move story to done
Most conflicts in this codebase are additive — two branches adding different features to the same files, not contradictory changes.
## Out of Scope
- TBD