Skip to content

armgit / solr

Public Imported from GitHub
0

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.sh
index b3902ccd157..bdf25c150bd 100755
--- a/dev-tools/scripts/cherrypick.sh
+++ b/dev-tools/scripts/cherrypick.sh
@@ -166,6 +166,7 @@ for BRANCH in "${BRANCHES[@]}"; do
fi
if yesno "Have you resolved the merge conflict? (y/n) "; then
LOG INFO "Continuing..."
+ $GIT_COMMAND cherry-pick --continue
else
if yesno "Clean up by aborting the cherry-pick? (y/n) "; then
$GIT_COMMAND cherry-pick --abort