Show proper error message when opening shell failed

1 files changed, 4 insertions, 1 deletions

diff --git a/task/release.rake b/task/release.rake
index cd66ff755d..3a14243263 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -182,7 +182,10 @@ namespace :release do
 
     if commits.any? && !system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first))
       warn "Opening a new shell to fix the cherry-pick errors"
-      abort unless system("zsh")
+
+      unless system("zsh")
+        abort "Failed to resolve conflicts on a different shell. Resolve conflicts manually and finish the task manually"
+      end
     end
 
     version_file = "lib/bundler/version.rb"