make conflict marker

nokotan · Jul 22, 2024 · 21f35b8 · 21f35b8
1 parent 824c2f2
commit 21f35b8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ci-scripts/Util.sh b/ci-scripts/Util.sh
@@ -32,7 +32,13 @@ function apply_to_develop_branch() {
     git cherry-pick --allow-empty $1
 
     if [ $? -ne 0 ]; then
-        err_exit "Git cherry-pick failed!"
+        warn "conflict detected. need to merge manually."
+        git stage .
+        git cherry-pick --continue
+
+        if [ $? -ne 0 ]; then
+            err_exit "Git cherry-pick failed!"
+        fi
     fi
 
     info "### apply_to_develop_branch done"