diff --git a/.story_kit/work/4_merge/250_bug_merge_pipeline_cherry_pick_fails_with_bad_revision_on_merge_queue_branch.md b/.story_kit/work/4_merge/250_bug_merge_pipeline_cherry_pick_fails_with_bad_revision_on_merge_queue_branch.md index a69a761..9252c9c 100644 --- a/.story_kit/work/4_merge/250_bug_merge_pipeline_cherry_pick_fails_with_bad_revision_on_merge_queue_branch.md +++ b/.story_kit/work/4_merge/250_bug_merge_pipeline_cherry_pick_fails_with_bad_revision_on_merge_queue_branch.md @@ -1,5 +1,6 @@ --- name: "Merge pipeline cherry-pick fails with bad revision on merge-queue branch" +merge_failure: "Squash-merge resulted in an empty diff — the feature branch has no code changes beyond master. The bug fix code may not have been committed to the feature branch, or changes were already merged previously." --- ## Rejection Notes