Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔧 [dependabot] Reduce merge conflicts using the lockfile-only strategy #746

Merged
merged 1 commit into from
Dec 27, 2021

Commits on Dec 27, 2021

  1. 🔧 [dependabot] Reduce merge conflicts using the lockfile-only strategy

    Dependabot updates version constraints in pyproject.toml even when the version
    constraint already covers the new version, leading to frequent merge conflicts
    because the global content hash in poetry.lock changes.
    
    As of #744, this project
    template no longer uses upper version bounds for its dependencies. As a result,
    we are now able to use the "lockfile-only" versioning strategy to upgrade
    dependencies, including major version bumps. This strategy prevents Dependabot
    from modifying pyproject.toml, putting an end to the frequent merge conflicts.
    cjolowicz committed Dec 27, 2021
    Configuration menu
    Copy the full SHA
    6e614ab View commit details
    Browse the repository at this point in the history