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.

Sign up for GitHub

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

Jump to bottom

handle botched merge conflict resolutions/new whls being uploaded to a pypi project #1

Open
graingert opened this issue Jul 9, 2020 · 0 comments
Open

handle botched merge conflict resolutions/new whls being uploaded to a pypi project #1

graingert opened this issue Jul 9, 2020 · 0 comments

Comments

@graingert
Copy link
Contributor

Multiple times I've resolved a merge conflict and copied hashes from one requirement pin into another, and only noticed when manually reviewing. pip-compile is perfectly happy to trust these hashes.

strip the --hash lines from the file before running pip-compile or wait for and use --no-reuse-hashes: jazzband/pip-tools#1177 jazzband/pip-tools#1176
@graingert graingert changed the title handle botched merge conflict resolutions/new whls beaing uploaded to a pypi project handle botched merge conflict resolutions/new whls beeing uploaded to a pypi project Jul 11, 2020
@graingert graingert changed the title handle botched merge conflict resolutions/new whls beeing uploaded to a pypi project handle botched merge conflict resolutions/new whls being uploaded to a pypi project Jul 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@graingert