title: How do you resolve Git conflicts in yarn.lock
body: <p>When multiple Git branches modify the dependencies in a project that uses <a href="http://yarnpkg.com" rel="noreferrer">Yarn</a>, it is likely to introduce a conflict in the yarn.lock file. It is not a good idea to delete and regenerate the yarn.lock file because this will probably cause several packages to be unintentionally upgraded. What is the best way to quickly resolve conflicts in this file?</p>