make conflict marker

Author: nokotan

ci-scripts/Util.sh

@@ -33,7 +33,7 @@ function apply_to_develop_branch() {
 
     if [ $? -ne 0 ]; then
         warn "conflict detected. need to merge manually."
-        git add src
+        git add src/*
         git cherry-pick --continue
 
         if [ $? -ne 0 ]; then