From 6bfa10b0e59e59b2affb209c76c7775589c5b8e9 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 17 Mar 2026 17:55:15 +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 6de4169..23363e6 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: .story_kit/work/1_upcoming/269_story_file_references_in_web_ui_chat_input.md was renamed to work/4_merge/ on master but to work/2_current/ on the feature branch. Auto-resolution failed because the original file no longer exists at the expected path. Human needs to resolve the story file location conflict before re-triggering merge." +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 cannot handle rename/rename conflicts. The story file needs to be resolved manually (likely by accepting the 4_merge/ location on master and removing the 2_current/ version from the feature branch), then re-triggering the merge." --- # Story 269: @ file references in web UI chat input