nitinbhojwani · July 2, 2021 07:19
diff --git a/resolve-conflicts-with-poetry-lock.sh b/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.
	# 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.