Re: [Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-11 Thread Dan Tenenbaum
- Original Message - > From: "Dan Tenenbaum" > To: "Luca De Sano" > Cc: "bioc-devel" > Sent: Friday, March 11, 2016 8:33:58 AM > Subject: Re: [Bioc-devel] Your branch and 'bioc/master' have diverged > - Original Message --

Re: [Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-11 Thread Dan Tenenbaum
- Original Message - > From: "Luca De Sano" > To: "Dan Tenenbaum" > Cc: "bioc-devel" > Sent: Friday, March 11, 2016 4:20:59 AM > Subject: Re: [Bioc-devel] Your branch and 'bioc/master' have diverged > But, after the what yo

Re: [Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-11 Thread Dan Tenenbaum
- Original Message - > From: "Luca De Sano" > To: "Dan Tenenbaum" > Cc: "bioc-devel" > Sent: Friday, March 11, 2016 4:20:59 AM > Subject: Re: [Bioc-devel] Your branch and 'bioc/master' have diverged > But, after the what you

Re: [Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-11 Thread Luca De Sano
10:21:38 AM > > Subject: Re: [Bioc-devel] Your branch and 'bioc/master' have diverged > > > On 10 March 2016 at 18:17, Dan Tenenbaum wrote: > > > >> > >> > >> - Original Message - > >> > From: "Luca De Sano&q

Re: [Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-10 Thread Dan Tenenbaum
- Original Message - > From: "Luca De Sano" > To: "Dan Tenenbaum" > Cc: "bioc-devel" > Sent: Thursday, March 10, 2016 10:21:38 AM > Subject: Re: [Bioc-devel] Your branch and 'bioc/master' have diverged > On 10 March 2016

Re: [Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-10 Thread Luca De Sano
On 10 March 2016 at 18:17, Dan Tenenbaum wrote: > > > - Original Message - > > From: "Luca De Sano" > > To: "bioc-devel" > > Sent: Thursday, March 10, 2016 3:22:14 AM > > Subject: [Bioc-devel] Your branch and 'bioc/master'

Re: [Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-10 Thread Dan Tenenbaum
- Original Message - > From: "Luca De Sano" > To: "bioc-devel" > Sent: Thursday, March 10, 2016 3:22:14 AM > Subject: [Bioc-devel] Your branch and 'bioc/master' have diverged > Hi all, > I'm trying to update the devel branch of

[Bioc-devel] Your branch and 'bioc/master' have diverged

2016-03-10 Thread Luca De Sano
Hi all, I'm trying to update the devel branch of my package following the instruction found in https://bioconductor.org/developers/how-to/git-mirrors/ . The repo of my project is: https://github.com/BIMIB-DISCo/TRONCO >From devel I've first tried to do a git merge master, with no results. I've th