Re: [Bioc-devel] git transition for projects with prior git history

The SVN repo is the most current version of your package as far as Bioconductor goes. Unfortunately, you have totally unrelated histories by the looks of it. (This should show up as an error, when you try to “merge”, i.e `git merge upstream/master`) I would suggest moving forward with the new

Re: [Bioc-devel] git transition for projects with prior git history

The SVN repo is the most current version of your package as far as Bioconductor goes. Unfortunately, you have totally unrelated histories by the looks of it. I would suggest moving forward with the new git repo, after the transition is done on August 16th. I would not “delete” the repository

Re: [Bioc-devel] git transition for projects with prior git history

I tried following the instructions in scenario 9 after adding a remote: $ git remote add upstream https://git.bioconductor.org/packages/GENESIS.git $ git fetch --all Fetching origin Fetching upstream warning: no common commits When I merge both upstream and origin, I see all my commits in

Re: [Bioc-devel] git transition for projects with prior git history

VN > > commits from the git tree. > > > > > > > On Jul 28, 2017, at 11:33 AM, Turaga, Nitesh > > > <nitesh.tur...@roswellpark.org> wrote: > > > > > > I would be careful before using the --allow-unrelated-histories flag. > > > Please investig

Re: [Bioc-devel] git transition for projects with prior git history

t; > > > I would be careful before using the --allow-unrelated-histories flag. > Please investigate where there is a difference. > > > > > > Also, i don't understand why you are using the > bioconductor-git-mirror? Your non-zero commit history should be related to &

Re: [Bioc-devel] git transition for projects with prior git history

g. Please >> investigate where there is a difference. >> >> Also, i don't understand why you are using the bioconductor-git-mirror? Your >> non-zero commit history should be related to bioconductor git server. >> >> Best >> >> Nitesh >>

Re: [Bioc-devel] git transition for projects with prior git history

> > Please investigate where there is a difference. > > > > Also, i don't understand why you are using the bioconductor-git-mirror? > > Your non-zero commit history should be related to bioconductor git server. > > > > Best > > > > Nitesh > > > >

Re: [Bioc-devel] git transition for projects with prior git history

ver. > > > > Best > > > > Nitesh > > > > Get Outlook for Android > > > > > > > > From: Vladimir Kiselev > > Sent: Thursday, July 27, 5:11 PM > > Subject: Re: [Bioc-devel] git transition for projects with prior git > history > &

Re: [Bioc-devel] git transition for projects with prior git history

r-git-mirror? Your > non-zero commit history should be related to bioconductor git server. > > Best > > Nitesh > > Get Outlook for Android > > > > From: Vladimir Kiselev > Sent: Thursday, July 27, 5:11 PM > Subject: Re: [Bioc-devel] git transition for pro

Re: [Bioc-devel] git transition for projects with prior git history

for Android<https://aka.ms/ghei36> From: Vladimir Kiselev Sent: Thursday, July 27, 5:11 PM Subject: Re: [Bioc-devel] git transition for projects with prior git history To: McDavid, Andrew, bioc-devel@r-project.org Hi Andrew, I solved it by just adding '--allow-unrelated-histories' to

Re: [Bioc-devel] git transition for projects with prior git history

Hi Andrew, I solved it by just adding '--allow-unrelated-histories' to force the merge: https://stackoverflow.com/questions/37937984/git-refusing-to-merge-unrelated-histories Cheers, Vlad On Thu, Jul 27, 2017 at 9:53 PM McDavid, Andrew < andrew_mcda...@urmc.rochester.edu> wrote: > Is there a

[Bioc-devel] git transition for projects with prior git history

Is there a recommended recipe to utilize the git.bioconductor.org remote with an existing git repo that has non-zero history? I tried adding the git.bioconductor.org as a remote, making a branch, and then checking out a branch on that