From cb7dde9fc1aa5a6201f7177595a9a3b88cc920ac Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 17 Mar 2026 13:01:15 +0000 Subject: [PATCH] story-kit: queue 256_story_bot_must_verify_other_users_cross_signing_identity_before_checking_device_verification for merge --- ...cross_signing_identity_before_checking_device_verification.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.story_kit/work/4_merge/256_story_bot_must_verify_other_users_cross_signing_identity_before_checking_device_verification.md b/.story_kit/work/4_merge/256_story_bot_must_verify_other_users_cross_signing_identity_before_checking_device_verification.md index 2dab62d..36e5ac7 100644 --- a/.story_kit/work/4_merge/256_story_bot_must_verify_other_users_cross_signing_identity_before_checking_device_verification.md +++ b/.story_kit/work/4_merge/256_story_bot_must_verify_other_users_cross_signing_identity_before_checking_device_verification.md @@ -1,6 +1,7 @@ --- name: "Bot must verify other users' cross-signing identity before checking device verification" agent: coder-opus +merge_failure: "Rename/rename conflict on the story file: master has it in work/4_merge/ while the feature branch has it in work/2_current/. The auto-resolver cannot handle rename/rename conflicts (it expects the file at work/1_upcoming/ which no longer exists). A human needs to resolve the story file location conflict before re-triggering the merge." --- # Story 256: Bot must verify other users' cross-signing identity before checking device verification