From 02ba4ca68e0bc1d3055e141e5c9dbe0d297acd1c Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 23 Feb 2026 23:10:03 +0000 Subject: [PATCH] story-kit: start 119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master --- ...nflicts_instead_of_leaving_conflict_markers_on_master.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.story_kit/work/2_current/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md b/.story_kit/work/2_current/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md index ee20c73..665ef2b 100644 --- a/.story_kit/work/2_current/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md +++ b/.story_kit/work/2_current/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md @@ -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 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