Re: [Bioc-devel] Issue with syncing Github to Bioconductor /devel landing page

2018-09-27 Thread Shepherd, Lori
uk Sent: Wednesday, September 26, 2018 7:32:45 PM To: bioc-devel@r-project.org Subject: [Bioc-devel] Issue with syncing Github to Bioconductor /devel landing page I'm following the steps recommended at https://bioconductor.org/developers/how-to/git/sync-existing-repositories/ but getting an une

[Bioc-devel] Issue with syncing Github to Bioconductor /devel landing page

2018-09-26 Thread Bohdan Khomtchouk
I'm following the steps recommended at https://bioconductor.org/developers/how-to/git/sync-existing-repositories/ but getting an unexpected error: bohdankhomtchouk$ git merge upstream/master merge: upstream/master - not something we can merge I just updated https://git.bioconductor.org/packages/