From 6c318336b423ed183840d0890e8d6695203f0302 Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Wed, 6 Oct 2021 16:58:00 +0200 Subject: [PATCH] Add changeset Signed-off-by: Erik Engervall --- .changeset/sour-terms-end.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/sour-terms-end.md diff --git a/.changeset/sour-terms-end.md b/.changeset/sour-terms-end.md new file mode 100644 index 0000000000..fd20fa13c8 --- /dev/null +++ b/.changeset/sour-terms-end.md @@ -0,0 +1,7 @@ +--- +'@backstage/plugin-git-release-manager': minor +--- + +Errors caused while patching can leave the release branch in a broken state. Most commonly caused due to merge errors. + +This has been solved by introducing a dry run prior to patching the release branch. The dry run will attempt to cherry pick the selected patch commit onto a temporary branch created off of the release branch. If it succeeds, the temporary branch is deleted and the patch is applied on the release branch