story-kit: queue 266_story_matrix_bot_structured_conversation_history for merge
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
---
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user