Re: [Bioc-devel] GitHub and Bioc sync: issue with dup commit for the sva package

2018-08-30 Thread Turaga, Nitesh
Hi Leo, You are right in that you cannot “force” push to git.bioconductor.org. I’ve just done this for you. The git history looks clean and you can sync your Github and Bioc (http://bioconductor.org/developers/how-to/git/sync-existing-repositories/) for any further changes without any issues

Re: [Bioc-devel] GitHub and Bioc sync: issue with dup commit for the sva package

2018-08-29 Thread Claire Ruberman
Thank you, Leo! On Mon, Aug 27, 2018 at 1:53 PM Leonardo Collado Torres wrote: > Hi Nitesh, > > After looking more closely, I went with option 1 that you clearly > outlined below. The cherry picked version of the history is now the > origin/master one at > https://github.com/jtleek/sva-devel/com

Re: [Bioc-devel] GitHub and Bioc sync: issue with dup commit for the sva package

2018-08-27 Thread Leonardo Collado Torres
Hi Nitesh, After looking more closely, I went with option 1 that you clearly outlined below. The cherry picked version of the history is now the origin/master one at https://github.com/jtleek/sva-devel/commits/master. From http://bioconductor.org/developers/how-to/git/resolve-duplicate-commits/ my

Re: [Bioc-devel] GitHub and Bioc sync: issue with dup commit for the sva package

2018-08-27 Thread Leonardo Collado Torres
Thank you Nitesh! I'll talk to Jeff and Claire. Best, Leo On Sat, Aug 25, 2018 at 2:00 AM Turaga, Nitesh wrote: > > Hi Leo, > > I’ll try to help you with this issue. > > The duplicates commit you have on your package “sva” come from the pre-git > era of Bioconductor. There are three ways we c

Re: [Bioc-devel] GitHub and Bioc sync: issue with dup commit for the sva package

2018-08-24 Thread Turaga, Nitesh
Hi Leo, I’ll try to help you with this issue. The duplicates commit you have on your package “sva” come from the pre-git era of Bioconductor. There are three ways we can fix this, 1, You fix your GitHub repo by removing the duplicate commits. They happen only after this commit. commit d12

[Bioc-devel] GitHub and Bioc sync: issue with dup commit for the sva package

2018-08-24 Thread Leonardo Collado Torres
Hi, I'm having trouble with synching a github repo with Bioc. At https://github.com/jtleek/sva-devel/commits/master we have 3 recent commits by Claire that we want to sync with Bioc. I followed the instructions at http://bioconductor.org/developers/how-to/git/sync-existing-repositories/ and then