Re: [Bioc-devel] Rebasing possible on bioconductor git ?

2019-12-09 Thread Turaga, Nitesh
Hi Alex, The easiest way to do this is literally just "fetch and merge". 5371 git clone g...@github.com:al2na/methylKit.git 5372 cd methylKit 5377 git remote add upstream g...@git.bioconductor.org:packages/methylKit 5378 git fetch --a

Re: [Bioc-devel] Rebasing possible on bioconductor git ?

2019-12-09 Thread Alexander Gosdschan
As you can see in the branch network https://github.com/al2na/methylKit/network , I already rebased all commits to a copy of bioc master and checked the build on travis, but I was wondering whether this is the best way to do it. Because this way I am r

Re: [Bioc-devel] Rebasing possible on bioconductor git ?

2019-12-09 Thread Alexander Gosdschan
The package I am talking about is methylKit, (https://github.com/al2na/methylKit ). > On 9. Dec 2019, at 16:29, Turaga, Nitesh > wrote: > > Hi, > > Please let me know which package you are talking about. > > Also, give me your GitHub package name. >

Re: [Bioc-devel] Rebasing possible on bioconductor git ?

2019-12-09 Thread Turaga, Nitesh
Hi, Please let me know which package you are talking about. Also, give me your GitHub package name. Nitesh > On Dec 9, 2019, at 7:24 AM, Alexander Gosdschan wrote: > > Hi, > > Somehow I missed to push a large number of commits to the bloc git master > branch before the latest release and

[Bioc-devel] Rebasing possible on bioconductor git ?

2019-12-09 Thread Alexander Gosdschan
Hi, Somehow I missed to push a large number of commits to the bloc git master branch before the latest release and now I have 50 commits on GitHub that happened before the release. What would be the best way to get the git remotes in sync again? Is it possible to rebase commits on the bioc ma