search

nsh87 / receptormarker

Source for 'receptormarker' package for R: antibody receptor and phenotypic marker analysis
http://receptormarker.com
BSD 2-Clause "Simplified" License
4 stars 9 forks source link

[Unrelated Commits] Update clust_boxplot to handle boolean #36

Closed catterbu closed 9 years ago

catterbu commented 9 years ago

This is based off of the current dev. It takes boolean data and changes it to the probabilities of either one in clust_boxplot.

nsh87 commented 9 years ago

So I notice to get this PR to just be about boolean data you're undoing the NbClust and PCA stuff in your last commit. That's fine, as long as your PRs to add NbClust and PCA have different SHAs than these. I'm not sure how that will be possible, unless some weird rebasing has happened. If the SHAs are the same then there will be nothing to merge in the PRs for NbClust and PCA. PRs just merge commits, and the commits are for NbClust and PCA are already in here, so doing a PR at a later point in time isn't going to add NbClust and PCA on top of this, it will just detect that the SHAs already exist and merge without changing anything.

Not sure what happened. It looks like each consecutive feature that you worked on you didn't branch from dev but rather you branched from the previous feature you were working on.

If you want to fix up your branches/PRs to potentially avoid have this PR overwrite any future PRs for NbClust and PCA commits I can wait to merge this; if not I'll merge as is and we can roll the dice that the SHAs for NbClust and PCA in your other branches are different than these ones.

nsh87 commented 9 years ago

@catterbu I'm not sure what's happened with all your commits here (sorry for the trouble), but I'm a bit uneasy about merging this when it overwrites other commits. Since you actual "add ability to handle boolean data" is just a single commit, could you please remove all the other commits in this branch? Easier way is to just create another branch off of my dev and copy and paste the code you have in your latest commit in this PR. It's so short it would be pretty easy (and potentially avoid us a serious disaster of having this PR overwrite all the other merges we made today).

nsh87 commented 9 years ago

Plus, the branch has conflicts., so I can't auto-merge. So if possible, get this into a single commit (or at least don't include commits that remove changes from other commits) and I'll merge either late tonight or tomorrow. Likely tomorrow...