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

[Turaga, Nitesh]

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 bioconductor git server.

Best

Nitesh

Get Outlook 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 at r-project.org


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_Mcdavid at urmc.rochester.edu> wrote: > Is there a recommended recipe to utilize the git.bioconductor.org< > http://git.bioconductor.org> remote with an existing git repo that has > non-zero history? I tried adding the git.bioconductor.org< > http://git.bioconductor.org> as a remote, making a branch, and then > checking out a branch on that remote, but it gave my computer sad. Do I > need to clone a new repo instead? > > Example: > $ git remote -vv > bioc https://github.com/Bioconductor-mirror/MAST.git (fetch) > bioc https://github.com/Bioconductor-mirror/MAST.git (push) > biocgit git at git.bioconductor.org:packages/MAST > (fetch) > biocgit git at git.bioconductor.org:packages/MAST > (push) > origin git at github.com:RGLab/MAST.git (fetch) > origin git at github.com:RGLab/MAST.git (push > > $ git fetch biocgit > $ git checkout -b bgMaster --track biocgit/master > ... > > ... > $ git merge master bgMaster > fatal: refusing to merge unrelated histories > > [[alternative HTML version deleted]] > > _______________________________________________ > Bioc-devel at r-project.org mailing list > https://stat.ethz.ch/mailman/listinfo/bioc-devel > -- http://genat.uk [[alternative HTML version deleted]] _______________________________________________ Bioc-devel at r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel



This email message may contain legally privileged and/or confidential information.  If you are not the intended recipient(s), or the employee or agent responsible for the delivery of this message to the intended recipient(s), you are hereby notified that any disclosure, copying, distribution, or use of this email message is prohibited.  If you have received this message in error, please notify the sender immediately by e-mail and delete this email message from your computer. Thank you.
	[[alternative HTML version deleted]]