dev-infra icon indicating copy to clipboard operation
dev-infra copied to clipboard
verified publisher icon angular

Consider supporting automatic conflict resolution for e.g. Yarn

Open devversion opened this issue 3 years ago • 1 comments

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 avatar Aug 05 '22 07:08 devversion

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

devversion avatar Aug 05 '22 07:08 devversion