DEV Community

Discussion on: Let Yarn Resolve Your Conflicts

Collapse
 
lizzieshipwreck profile image
Lizzie Shipton

Also just wanted to update: ran it today and discovered that if the conflicts cannot be merged successfully, Yarn will simply regenerate a new one from scratch. So perhaps the old method isn't so wrong after all