Make the lock file more merge-friendly
<!-- Hi there! Thank you for wanting to make Poetry better. Before you submit this; let's make sure of a few things. Please make sure the following boxes are ticked if they are correct. If not, please try and fulfill these first. --> <!-- Checked checkbox should look like this: [x] --> - [x] I have searched the [issues](https://github.com/sdispater/poetry/issues) of this repo and believe that this is not a duplicate. ## Issue When two devs install dependencies on separate branches, it is very easy to end up merge-conflicted, in particular, the `metadata.content-hash` key often changes. It is very unclear how to resolve this manually, so I often delete the lockfile (or perhaps just that key) and rebuild it and, basically, hope that it comes out the same. It seems like in some scenarios that merge conflicts could be resolved automatically based on `pyproject.toml`. [Yarn](https://github.com/yarnpkg/yarn) does this, for instance.
Posted by seansfkelley on Oct 16, 2018, 8:21 PM
Tags
Related issues
Raise real-world problems, find people facing the same issue, and discuss solutions.4,000 issues0 comments
onboarding (Software)
Minecraft Dungeons II (1912410)
We are seeing the realtime result of MS buying Github and buying influence.
macOS 15 Sequoia clobbers _nixbld1-4 users
News + Polls
Implement Pylint
Add Zig
Unable to run sandboxed process when run as elevated under applocker
[Feature request] Show browser error overlay for runtime errors
Make the lock file more merge-friendly
<!-- Hi there! Thank you for wanting to make Poetry better. Before you submit this; let's make sure of a few things. Please make sure the following boxes are ticked if they are correct. If not, please try and fulfill these first. --> <!-- Checked checkbox should look like this: [x] --> - [x] I have searched the [issues](https://github.com/sdispater/poetry/issues) of this repo and believe that this is not a duplicate. ## Issue When two devs install dependencies on separate branches, it is very easy to end up merge-conflicted, in particular, the `metadata.content-hash` key often changes. It is very unclear how to resolve this manually, so I often delete the lockfile (or perhaps just that key) and rebuild it and, basically, hope that it comes out the same. It seems like in some scenarios that merge conflicts could be resolved automatically based on `pyproject.toml`. [Yarn](https://github.com/yarnpkg/yarn) does this, for instance.
Comments (0)
No comments yet. Start the discussion.