From 45ae7b8f01e28af122bd880ab55abfa1f8431644 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 17 Mar 2026 17:49:46 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e4f3b97..c19b7cb 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,6 +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." +merge_failure: "Rename/rename conflict on story file: master moved it to 4_merge/ while the feature branch has it in 2_current/. The auto-resolver failed because it tried to read the original path (1_upcoming/) which no longer exists. This is a story pipeline file conflict that needs manual resolution." --- # Story 269: @ file references in web UI chat input