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 git repo, after the transition is done on August 16th. I would not “delete” the repository you have per say, and keep a backup. Best, Nitesh > On Aug 10, 2017, at 6:30 PM, Stephanie M. Gogarten > <sdmor...@u.washington.edu> wrote: > > 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 duplicate: one > from my original repo, and one from Bioconductor. > > My repo has a rather complicated history: original author forked from the > Bioc mirror, I forked from his repo, submitted a pull request, he pushed > those changes back to SVN. Later I took over maintenance, set the Bioc mirror > as a remote, and pushed my changes directly using git cherry-pick. > > I'm guessing that the only reasonable path forward here is to just delete the > current repo and start over after the transition, but I'm wondering if anyone > else has seen the "no common commits" message, or has any other ideas. > > thanks, > Stephanie > > On 7/27/17 1:52 PM, McDavid, Andrew 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 >> g...@git.bioconductor.org<mailto:g...@git.bioconductor.org>:packages/MAST >> (fetch) >> biocgit >> g...@git.bioconductor.org<mailto:g...@git.bioconductor.org>:packages/MAST >> (push) >> origin g...@github.com<mailto:g...@github.com>:RGLab/MAST.git (fetch) >> origin g...@github.com<mailto:g...@github.com>:RGLab/MAST.git (push >> $ git fetch biocgit >> $ git checkout -b bgMaster --track biocgit/master >> ... >> <some commits to master> >> ... >> $ git merge master bgMaster >> fatal: refusing to merge unrelated histories >> [[alternative HTML version deleted]] >> _______________________________________________ >> Bioc-devel@r-project.org mailing list >> https://stat.ethz.ch/mailman/listinfo/bioc-devel >> > > _______________________________________________ > Bioc-devel@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. _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
