Consider supporting automatic conflict resolution for e.g. Yarn

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.

The issue names a merge tool and proposes a separate command for splitting up a PR, with Yarn as an example of automatic conflict resolution. Start by locating the merge-tool entry point and reviewing how PR conflicts are currently handled. Done should include a defined command or workflow that can use automatic resolution safely.

Written by the indexing model from the issue text.