`poetry lock` should overwrite broken `poetry.lock` file, not error out.

… ~/my_project> poetry shell

[EmptyKeyError]
Empty key at line 36 col 0

shell

The actual reason is that I have a merge conflict in pyproject.toml. I wish poetry told me that! 🙏

Also, if the merge conflict is in poetry.lock the best action to resolve it is seemingly to run poetry lock (assuming project is close to HEAD and not some old branch merged with another old branch).

(poetry versions tested: 1.0.0a2 1.0.0a4 0.12.16)

[passionsfrucht]

Not really a solution, but a tip, or how I integrate it in my workflow regarding --no-update. It usually happens when I do a rebase, thus to hinder it to do an unintended upgrade:

$ git checkout origin/master -- poetry.lock
??? updated 1 file ???
$ poetry lock --no-update

I’m quite positive that it can be done in a more elegant way using --ours or some .gitattributes magic with a check if the lock file needs an update, but this way it is good enough for me right now.

So maybe it can be handled as a documentation issue?

Disclaimer: I just looked it up in my command history. And wrote the results how I remembered it, I may have got a detail wrong.

[kkirsche]

If there are concerns about the scope of this type of change, an alternative solution would be to restrict when situations overwriting or “fixing” the lockfile occurs. For example, automate fixing merge conflicts potentially as yarn does? Overall, a smaller scope allows for alternative technical implementations to be used in order to satisfy the requirement.

EDIT: Fixed grammatical issues