Closed nleroy917 closed 2 years ago
@nsheff @Khoroshevskyi @rafalstepien I ended up just creating a new branch on origin
since I wasn't able to make changes to Michal's personal branch to resolve merge conflicts... I am not 100% sure I did everything correctly, however. I am a bit afraid to merge this into dev for fear of blowing away everything we did previously. There are no unit tests to test for this.
If people could give me a sanity check that merging into dev
won't steamroll the from_dict
changes, that would be helpful.
My thoughts about merging this two branches: create new branch from dev and then create pull request from michal_changes to this new branch. Next push new changes to dev branch and then to master
Looking at the files, all the equality and from_dict
stuff is here. So, it might be good to go
@rafalstepien could you confirm your stuff for optimization is here? Then I will merge to dev.
My changes were merged to dev
at July 18-th. Please see commits history.
I wasn't able to push to Michal's branch. So I just forked it and added a new branch to
origin
. Here are his original PR notes:Project.remove_samples
methodSee here for everything: https://github.com/pepkit/peppy/pull/374