dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

story-kit: queue 269_story_file_references_in_web_ui_chat_input for merge

Browse Source
This commit is contained in:
Dave
2026-03-17 17:55:15 +00:00
parent 65036b2ce7
commit 6bfa10b0e5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md
View File

@@ -1,6 +1,6 @@
--- ---
name: "@ file references in web UI chat input" 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 # Story 269: @ file references in web UI chat input