Skip to content

Instantly share code, notes, and snippets.

@nitinbhojwani

nitinbhojwani/resolve-conflicts-with-poetry-lock.sh

Created July 2, 2021 07:19
Show Gist options
  • Save nitinbhojwani/e552956b5045fc0d18880c34288f3541 to your computer and use it in GitHub Desktop.
Save nitinbhojwani/e552956b5045fc0d18880c34288f3541 to your computer and use it in GitHub Desktop.
Download ZIP
Resolve git merge conflicts with poetry.lock
Raw
resolve-conflicts-with-poetry-lock.sh
# Pick the change from the branch just merged
git checkout --theirs poetry.lock
# Update poetry.lock from pyproject.toml without any update
poetry lock --no-update
# Yey! the conflict is resolved and poetry.lock is updated with correct hash.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment