diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-11-07 16:27:14 +0100 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-11-07 16:40:35 +0100 |
| commit | 27ce62fbe8e4d75736feec3aae3df33854193117 (patch) | |
| tree | a30aef43462ad69a67c80a39c36197ee7f0fc7b5 | |
| parent | ca2cf7d494871c141774185d0755911fc574a211 (diff) | |
| download | bundler-improve_prepare_release_task.tar.gz | |
Improve conflict resolution instructionsimprove_prepare_release_task
| -rw-r--r-- | task/release.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/task/release.rake b/task/release.rake index a39fbba63a..0b06e35acf 100644 --- a/task/release.rake +++ b/task/release.rake @@ -181,7 +181,7 @@ namespace :release do abort "Could not find commits for all PRs" unless commits.size == prs.size if commits.any? && !system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first)) - warn "Opening a new shell to fix the cherry-pick errors" + warn "Opening a new shell to fix the cherry-pick errors. Press Ctrl-D when done to resume the task" unless system(ENV["SHELL"] || "zsh") abort "Failed to resolve conflicts on a different shell. Resolve conflicts manually and finish the task manually" |