search

mcb-dev / mCodingBot

The Discord bot for the mCoding Discord server.
https://mcoding.io/discord
MIT License
12 stars 4 forks source link

Gitignore lockfile #69

Closed CircuitSacul closed 1 year ago

CircuitSacul commented 1 year ago

Doing this solves the problem of merge conflicts that can't be resolved manually.

CircuitSacul commented 1 year ago

Poetry docs explicitely say that poetry.lock should be committed.

If you have merge conflicts, try to commit the file separately. If it doesn't fix the issue, checkout to main branch, then do poetry lock --no-update.

If you're not satisfied with this solution, then commit poetry.lock only when it gets updated.

EDIT: fixed the typo in the lock command flag.

Personally I think that they're just wrong. It causes pain, and the "benefit" is that development is easier because we have the same versions... except that the pyproject.toml file is already very restrictive.

Lunarmagpie commented 1 year ago

Although having a lockfille is correct, I think removing it reduces friction for new contributors.