🔧 [dependabot] Reduce merge conflicts using the lockfile-only strategy#746
Merged
🔧 [dependabot] Reduce merge conflicts using the lockfile-only strategy#746
Conversation
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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. See dependabot/dependabot-core#4435 for details.
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.