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

story-kit: queue 266_story_matrix_bot_structured_conversation_history for merge

Browse Source
This commit is contained in:
Dave
2026-03-17 17:31:57 +00:00
parent 6deeba81a8
commit 71cbc21b01
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.story_kit/work/4_merge/266_story_matrix_bot_structured_conversation_history.md
View File

@@ -1,5 +1,6 @@
--- ---
name: "Matrix bot structured conversation history" name: "Matrix bot structured conversation history"
merge_failure: "Rename/rename conflict on story file: .story_kit/work/1_upcoming/266_story_matrix_bot_structured_conversation_history.md was renamed to 4_merge/ on master and to 2_current/ on the feature branch. The auto-resolver failed because it tried to read the file from 1_upcoming/ which no longer exists. Master is untouched. This needs manual conflict resolution - the story file needs to end up in the correct pipeline stage before re-merging."
--- ---
# Story 266: Matrix bot structured conversation history # Story 266: Matrix bot structured conversation history