[Monorepo] Splitting commits should handle cherry-pick merge conflicts

[divineniiquaye]

Is there an existing feature for this?

• [X] I have did my search before proposing a feature request

Proposal or Solution

While going through the code, referencing a recent commit #3a88aae added to the master branch. An error will only occur there if there's a cherry-pick merge conflict.

Instead of returning an error, the code should handle the conflict and continue cherry-picking.

Code of Conduct

• [X] I agree to follow this project's Code of Conduct