Consider supporting automatic conflict resolution for e.g. Yarn

[devversion]

Potentially a separate command for splitting up a PR, and this command/logic can also be used by the merge tool directly.

Yarn can resolve conflicts automatically.

[devversion]

Conversation: https://angular-team.slack.com/archives/C042EU9T5/p1659547785746329