Thanks! I found out in addition that in case you run `git rebase` instead of `git master`, you have to change the first command to be `git checkout --ours poetry.lock` instead of `git checkout --theirs poetry.lock` to use the poetry.lock version from the default branch. This is due to the swapped semantics of `ours` and `theirs` during `rebase`.
Comment
Thanks! I found out in addition that in case you run `git rebase` instead of `git master`, you have to change the first command to be `git checkout --ours poetry.lock` instead of `git checkout --theirs poetry.lock` to use the poetry.lock version from the default branch. This is due to the swapped semantics of `ours` and `theirs` during `rebase`.