Apache Solr open-source search software
cherry-pick continue after merge conflict (#655)
Mike Drob49fb8cf354f5
diff --git a/dev-tools/scripts/cherrypick.sh b/dev-tools/scripts/cherrypick.shindex b3902ccd157..bdf25c150bd 100755--- a/dev-tools/scripts/cherrypick.sh+++ b/dev-tools/scripts/cherrypick.sh@@ -166,6 +166,7 @@ for BRANCH in "${BRANCHES[@]}"; dofiif yesno "Have you resolved the merge conflict? (y/n) "; thenLOG INFO "Continuing..."+ $GIT_COMMAND cherry-pick --continueelseif yesno "Clean up by aborting the cherry-pick? (y/n) "; then$GIT_COMMAND cherry-pick --abort