From b862a7a6d0a7c535d90b5ec9b995b2e5da49f6c5 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 17 Mar 2026 17:29:36 +0000 Subject: [PATCH] story-kit: queue 267_story_mcp_update_story_tool_should_support_front_matter_fields for merge --- ...y_mcp_update_story_tool_should_support_front_matter_fields.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md b/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md index 2fddf6a..820a866 100644 --- a/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md +++ b/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md @@ -1,5 +1,6 @@ --- name: "MCP update_story tool should support front matter fields" +merge_failure: "Merge had 2 unresolvable conflicts: (1) .mcp.json modify/delete conflict — deleted in master but modified in feature branch. (2) Story file rename/rename conflict — renamed to work/4_merge/ in master but to work/2_current/ in feature branch. Auto-resolution failed. Master is untouched." --- # Story 267: MCP update_story tool should support front matter fields