These are chat archives for biom262/biom262-2016

3rd
Feb 2016
Yiren Hu
@Charlottehu
Feb 03 2016 18:54
I had the same problem before. Olga suggested to pull from the upstream and merge the conflict then commit. And it worked. Basically, you need to open the 0_alignment_expression file and solve the conflict lines.
Olga Botvinnik
@olgabot
Feb 03 2016 21:11
Yes you have to fix the merge conflicts
When it says that the noteobok is unreadable then it means there’s some non-jupyter stuff inthere which (in this case) is the merge conflicts from git