story-kit: queue 263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption for merge

This commit is contained in:
Dave
2026-03-17 15:31:25 +00:00
parent 230b8fdc35
commit b57c270144

View File

@@ -1,6 +1,6 @@
--- ---
name: "Matrix bot self-signs device keys at startup for verified encryption" name: "Matrix bot self-signs device keys at startup for verified encryption"
merge_failure: "Rename/rename conflict on story file: .story_kit/work/1_upcoming/263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption.md was renamed to 4_merge/ on master and to 2_current/ on the feature branch. Auto-resolution failed because the original file no longer exists at the 1_upcoming path. This is a story pipeline state conflict that needs manual resolution." merge_failure: "Rename/rename conflict on the story file: .story_kit/work/1_upcoming/263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption.md was renamed to 4_merge/ on master but to 2_current/ on the feature branch. Auto-resolution failed because the original file no longer exists at the 1_upcoming path. This is a story pipeline state conflict, not a code conflict."
--- ---
# Story 263: Matrix bot self-signs device keys at startup for verified encryption # Story 263: Matrix bot self-signs device keys at startup for verified encryption