build: improve workflows contents. (#3082)

.github/workflows/merge-from-milestone.yml

@@ -113,33 +113,14 @@ jobs:
 
               echo "Cherry-picking commit: $merge_commit"
               if ! git cherry-pick "$merge_commit" --strategy=recursive -X theirs; then
-                echo "Conflict detected for $merge_commit. Resolving with incoming changes."
-                conflict_files=$(git diff --name-only --diff-filter=U)
-                echo "Conflicting files:"
-                echo "$conflict_files"
-
-                for file in $conflict_files; do
-                  if [ -f "$file" ]; then
-                    echo "Resolving conflict for $file"
-                    git add "$file"
-                  else
-                    echo "File $file has been deleted. Skipping."
-                    git rm "$file"
-                  fi
-                done
-
-                echo "Conflicts resolved. Continuing cherry-pick."
-                git cherry-pick --continue || { echo "Cherry-pick failed, but continuing to create PR."; }
-              else
-                echo "Cherry-pick successful for commit $merge_commit."
+                echo "Cherry-pick encountered conflicts, attempting to continue..."
+                git cherry-pick --continue || { echo "Cherry-pick failed"; exit 1; }
               fi
 
               git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git"
               
               echo "Pushing branch: $cherry_pick_branch"
-              if ! git push origin $cherry_pick_branch --force; then
-                echo "Push failed, but continuing to create PR..."
-              fi
+              git push origin $cherry_pick_branch --force || { echo "Push failed"; exit 1; }
 
               new_pr_title="$pr_title [Created by @$pr_creator from #$pr_number]"
               new_pr_body="$pr_body