Consider supporting automatic conflict resolution for e.g. Yarn #760
Description
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.
{{ message }}