search

lifeomic / phc-sdk-py

The phc-sdk-py is a developer kit for interfacing with the PHC API on Python 3.8 and above.
https://lifeomic.github.io/phc-sdk-py/index.html
MIT License
1 stars 2 forks source link

Poetry #189

Closed shawnzhu closed 1 year ago

shawnzhu commented 1 year ago

Depends on #188

Notice that only pure python wheels are supported by poetry build.

shawnzhu commented 1 year ago

193

shawnzhu commented 1 year ago

So once I add reviewers I try to just add additional commits or if I have to I'll do a merge commit if the branch is out of date with master.

I'm totally with you on improving code review experience. this forced push is for resolving conflicts on multiple commits upon rebasing. the dilemma for me is about what to do in step 8 of Resolving a merge conflict using the command line:

option A: keep commits immutable, resolve merge conflicts in new commit(s) - I assume this is what you suggested option B: keep commits atomic (squash feedback into individual commit) to keep a simple list of changes (w/ rebasing).

will try option A if it makes review easier. (I usually try to keep change small and atomic to avoid this and this PR is definitely not a good example).

epeters3 commented 1 year ago

option A: keep commits immutable, resolve merge conflicts in new commit(s) - I assume this is what you suggested

You're so nice to care. I definitely have trouble keeping the review experience nice as well when I have merge conflicts, so we're in the same boat. Also, yes I think option A here is what I was thinking of.