diff --git a/.story_kit/work/4_merge/235_story_show_agent_logs_for_a_story_in_expanded_work_item.md b/.story_kit/work/4_merge/235_story_show_agent_logs_for_a_story_in_expanded_work_item.md index e20a20d..9c38873 100644 --- a/.story_kit/work/4_merge/235_story_show_agent_logs_for_a_story_in_expanded_work_item.md +++ b/.story_kit/work/4_merge/235_story_show_agent_logs_for_a_story_in_expanded_work_item.md @@ -1,6 +1,6 @@ --- name: "Show agent logs for a story in expanded work item" -merge_failure: "Merge workspace is occupied by story 236 (merge-queue/236_story_show_test_results_for_a_story_in_expanded_work_item). The merge pipeline uses a single merge_workspace directory and it is currently locked by another merge. Story 235 cannot proceed until the 236 merge completes or its stale worktree is cleaned up. To unblock: either wait for 236's merge to finish, or manually clean up with `git worktree remove .story_kit/merge_workspace` and `git branch -D merge-queue/236_story_show_test_results_for_a_story_in_expanded_work_item`." +merge_failure: "Merge workspace `.story_kit/merge_workspace` is still occupied by story 236's merge branch (merge-queue/236_story_show_test_results_for_a_story_in_expanded_work_item). The merge pipeline cannot create a new worktree while the existing one is present. To unblock: either wait for story 236's merge to complete, or manually clean up with `git worktree remove .story_kit/merge_workspace` and `git branch -D merge-queue/236_story_show_test_results_for_a_story_in_expanded_work_item`, then re-trigger the merge for story 235." --- # Story 235: Show agent logs for a story in expanded work item