From b0d9fb4f398853b81038751f0a8db765cde5c4fe Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 17 Mar 2026 17:47:07 +0000 Subject: [PATCH] story-kit: queue 269_story_file_references_in_web_ui_chat_input for merge --- .../4_merge/269_story_file_references_in_web_ui_chat_input.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md b/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md index 61138d9..e4f3b97 100644 --- a/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md +++ b/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md @@ -1,5 +1,6 @@ --- name: "@ file references in web UI chat input" +merge_failure: "Rename/rename conflict on story file: master has it in work/4_merge/ but the feature branch has it in work/2_current/. The auto-resolver failed because it tried to read from the original 1_upcoming/ path which no longer exists on either side. This is a story pipeline state conflict that needs manual resolution." --- # Story 269: @ file references in web UI chat input