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

story-kit: start 119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master

Browse Source
This commit is contained in:
Dave
2026-02-23 23:10:03 +00:00
parent 46cd45f922
commit 02ba4ca68e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.story_kit/work/2_current/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md
View File

@@ -28,9 +28,11 @@ The merge tool itself does the right thing (aborts on conflicts at `agents.rs:21
5. Mergemaster can resolve conflicts on the merge-queue branch without affecting master 5. Mergemaster can resolve conflicts on the merge-queue branch without affecting master
6. If resolution fails, reset merge-queue to master and report the conflict 6. If resolution fails, reset merge-queue to master and report the conflict
## Alternative: Pause Watcher During Merges ## Also Required: Pause Watcher During Merges
Add a lock/pause mechanism to the watcher that `merge_agent_work` acquires before running `git merge --squash`. The watcher skips auto-commits while the lock is held. Simpler but less robust. Add a lock/pause mechanism to the watcher that `merge_agent_work` acquires before running `git merge --squash`. The watcher skips auto-commits while the lock is held. This is a belt-and-suspenders defense — even with the merge-queue branch, we want the watcher to not interfere with merge operations.
**Implement both approaches** — the merge-queue branch for isolation, and the watcher pause as a safety net.
## Also Update Mergemaster Prompt ## Also Update Mergemaster Prompt