Point mut validations

[ajgreaney]

Have not yet knitted Rmd files to github documents. Maybe @tylernstarr can try.

[jbloom]

@tylernstarr, it should be OK to merge now. Although check to make sure it all seems correct.

The issue with what you did is that simply deleting the files on the branch does not resolve the conflict, because now master says they should have some particular value, while the branch says they should be deleted altogether. The solution was to checkout those particular files into the branch so the branch and master were the same.

So what I did (after pulling the latest version of everything) was to first go to @ajgreaney's new branch:

git checkout master
git pull
git checkout point_mut_validations

Then after getting on @ajgreaney's branch and making sure everything was up-to-date, I checked out the specific files in question from master:

git checkout master data/isogenic_titrations/results/homolog_FITC_expression.pdf
git checkout master data/isogenic_titrations/results/homolog_titration.pdf
git checkout master data/isogenic_titrations/results/isogenic_titrations_summary.csv 
git checkout master data/isogenic_titrations/results/wildtype_triplicate_titration.pdf  

Finally, I committed these to the branch and pushed it and that resolved the conflict.

Of course, the easiest way is just to avoid conflicts in the first place. I think the ultimate source of this was that @ajgreaney may have made her new branch of an old version of master. So although the conflicts can always be resolved like above, it's easiest just to minimize them in the first place by making sure you have the latest version of master before making a new branch. So @ajgreaney, in the future you can do this with:

git checkout master
git pull

and only then create your branch.