Skip to content
This repository has been archived by the owner on Dec 30, 2021. It is now read-only.

cjolowicz/poetry-merge-lock

Repository files navigation

poetry-merge-lock

This repository was archived because poetry-merge-lock is not needed anymore. Use the technique described in python-poetry/poetry#496 (comment) to resolve merge conflicts in Poetry lock files in a safe way. This tool depends on implementation details of Poetry, so it's likely to break in newer versions of Poetry.

Tests Codecov PyPI Python Version Read the Docs License Black pre-commit Dependabot

This is a tool for resolving merge conflicts in the lock file of Poetry, a packaging and dependency manager for Python. If the merge conflicts cannot be resolved by this tool, you can use the --print-content-hash option to compute the content hash for the metadata.content-hash entry, and resolve the conflicts manually.

Installation

To install poetry-merge-lock, run this command in your terminal:

$ pip install poetry-merge-lock

Documentation

Read the full documentation