Re: [Bioc-devel] git transition: unrelated histories

2017-09-04 Thread Turaga, Nitesh
esh Cc: bioc-devel@r-project.org Subject: Re: [Bioc-devel] git transition: unrelated histories Hi Nitesh, I think I solved it: another �--allow-unrelated-histories� for the merge from the additional branch did the trick. Best, Fabian On 1. Sep 2017, at 20:57, Turaga, Nitesh <nitesh.tur...@

Re: [Bioc-devel] git transition: unrelated histories

2017-09-04 Thread Fabian Müller
Hi Nitesh, I think I solved it: another “--allow-unrelated-histories” for the merge from the additional branch did the trick. Best, Fabian > On 1. Sep 2017, at 20:57, Turaga, Nitesh > wrote: > > Hi Fabian, > > Could you please try the merge for the other

Re: [Bioc-devel] git transition: unrelated histories

2017-09-01 Thread Turaga, Nitesh
Hi Fabian, Could you please try the merge for the other branch? Or please give me the url of the GitHub package, and tell me which branch and I’ll see what the problem is. Or try it and copy the commands in the email along with the output. I need more information to help you resolve this.

[Bioc-devel] git transition: unrelated histories

2017-09-01 Thread Fabian Müller
Hi, I am trying to make the git transition from our RnBeads package. Unfortunately I am not able to merge from our current github’s master branch (which had been existing since SVN times) to the BioC master branch due to unrelated history: “refusing to merge unrelated histories” I would like to