Re: [Bioc-devel] R: Errors updating DaMiRseq package

2017-09-23 Thread Martin Morgan
On 09/23/2017 08:44 AM, Mattia Chiesa wrote: Dear Nitesh, thank you! Now it seems to work perfectly. I will check the effect tomorrow after the nighty build. Just another little question, related with my issue: I solve it using git merge --allow-unrelated-histories upstream/master And then res

[Bioc-devel] R: Errors updating DaMiRseq package

2017-09-23 Thread Mattia Chiesa
Dear Nitesh, thank you! Now it seems to work perfectly. I will check the effect tomorrow after the nighty build. Just another little question, related with my issue: I solve it using git merge --allow-unrelated-histories upstream/master And then resolving conflicts: git add DESCRIPTION git comm