如何解决这个yarn.lock冲突问题？
我一直在使用纱线和bitbucket开发Next.js项目。当我尝试将分支合并到原点时，但是发生了冲突问题。它来自Yarn.lock文件。 Origin和我的分支之间有很多差异。我如何解决这一冲突问题？
I've been developing next.js project using yarn and bitbucket. When I try to merge my branch to origin, but conflict problem is occurred. It is from yarn.lock file. There are many diffs between origin's and my branch's. How could I resolve this conflict problem?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您是否安装了任何新软件包？还是更新正在使用的人？如果是这样，您应该合并并保持更改。
但是，如果不是这种情况，只需丢弃更改并将文件放在原点上即可。因为如果您没有造成的来源上有问题，那么修复它不是您的工作。如果您的工作是修复它的工作，我会说您删除 Yarn.lock 文件，运行
YARN install并推动新的 yarn.lock 文件。Did you install any new packages? Or update the ones that were being used? If so, you should merge and keep your changes.
But if that's not the case, just discard your changes and keep the file as it was on the origin. Because if there was something wrong on the origin that you didn't cause, it's not your job to fix it. If it is your job to fix it, I'd say you delete your yarn.lock file, run
yarn installand push the new yarn.lock file.