This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 49fb8cf cherry-pick continue after merge conflict (#655)
49fb8cf is described below
commit 49fb8cf354f5c8338eae68dd05a40519041f132a
Author: Mike Drob <[email protected]>
AuthorDate: Sat Feb 19 20:41:45 2022 -0600
cherry-pick continue after merge conflict (#655)
---
dev-tools/scripts/cherrypick.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-tools/scripts/cherrypick.sh b/dev-tools/scripts/cherrypick.sh
index b3902cc..bdf25c1 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
