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

story-kit: queue 238_story_mergemaster_handles_merge_conflicts_by_resolving_them_automatically for merge

Browse Source
This commit is contained in:
Dave
2026-02-28 10:06:55 +00:00
parent 7f6303d30d
commit 670a6a6808
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/4_merge/238_story_mergemaster_handles_merge_conflicts_by_resolving_them_automatically.md
View File

@@ -1,5 +1,6 @@
---
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