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

[Turaga, Nitesh]

Make sure you do not have duplicate commits when you merge unrelated histories.

Thanks

Nitesh

Get Outlook for Android<https://aka.ms/ghei36>


From: Fabian M�ller <fmuel...@mpi-inf.mpg.de>
Sent: Monday, September 4, 2017 9:27:14 AM
To: Turaga, Nitesh
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...@roswellpark.org<mailto:nitesh.tur...@roswellpark.org>> wrote:

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.

Best,

Nitesh


On Sep 1, 2017, at 4:38 AM, Fabian M�ller 
<fmuel...@mpi-inf.mpg.de<mailto:fmuel...@mpi-inf.mpg.de>> wrote:

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 keep syncing both to our github and to BioC. I tried the 
�--allow-unrelated-histories� option, but it did not really work: after 
resolving a bunch of merge conflicts, pulling again from the BioC git and 
resolving merge conflicts again, I am able to push to BioC. However, if I then 
want to merge from another branch of our github, I get unrelated histories 
again.
Has anyone else had this issue and knows how to resolve this best?

Best regards,
Fabian

PS: Here is the link to our github:
https://github.com/epigen/RnBeads.git <https://github.com/epigen/RnBeads.git>
__
  Fabian M�ller
   Max Planck Institute for Informatics
   Computational Biology and Applied Algorithmics Department

   Saarland Informatics Campus
   Building E 1.4
   Room 509
   66123 Saarbr�cken
   Germany

   Phone: +49 (681) 9325 3009
   Email:  fmuel...@mpi-inf.mpg.de<mailto:fmuel...@mpi-inf.mpg.de>
   http://www.mpi-inf.mpg.de/~fmueller/


[[alternative HTML version deleted]]

___
Bioc-devel@r-project.org<mailto: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.



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]]

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel

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

[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 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.
> 
> Best,
> 
> Nitesh
> 
> 
>> On Sep 1, 2017, at 4:38 AM, Fabian Müller > > wrote:
>> 
>> 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 keep syncing both to our github and to BioC. I tried the 
>> “--allow-unrelated-histories” option, but it did not really work: after 
>> resolving a bunch of merge conflicts, pulling again from the BioC git and 
>> resolving merge conflicts again, I am able to push to BioC. However, if I 
>> then want to merge from another branch of our github, I get unrelated 
>> histories again.
>> Has anyone else had this issue and knows how to resolve this best?
>> 
>> Best regards,
>> Fabian
>> 
>> PS: Here is the link to our github:
>> https://github.com/epigen/RnBeads.git 
>>  
>> > >
>> __
>>   Fabian Müller 
>>Max Planck Institute for Informatics
>>Computational Biology and Applied Algorithmics Department
>> 
>>Saarland Informatics Campus
>>Building E 1.4
>>Room 509
>>66123 Saarbrücken
>>Germany
>> 
>>Phone: +49 (681) 9325 3009
>>Email:  fmuel...@mpi-inf.mpg.de
>>http://www.mpi-inf.mpg.de/~fmueller/
>> 
>> 
>>  [[alternative HTML version deleted]]
>> 
>> ___
>> 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.


[[alternative HTML version deleted]]

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel

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

[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.

Best,

Nitesh


> On Sep 1, 2017, at 4:38 AM, Fabian Müller  wrote:
> 
> 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 keep syncing both to our github and to BioC. I tried the 
> “--allow-unrelated-histories” option, but it did not really work: after 
> resolving a bunch of merge conflicts, pulling again from the BioC git and 
> resolving merge conflicts again, I am able to push to BioC. However, if I 
> then want to merge from another branch of our github, I get unrelated 
> histories again.
> Has anyone else had this issue and knows how to resolve this best?
> 
> Best regards,
> Fabian
> 
> PS: Here is the link to our github:
> https://github.com/epigen/RnBeads.git 
> __
>Fabian Müller 
> Max Planck Institute for Informatics
> Computational Biology and Applied Algorithmics Department
> 
> Saarland Informatics Campus
> Building E 1.4
> Room 509
> 66123 Saarbrücken
> Germany
> 
> Phone: +49 (681) 9325 3009
> Email:  fmuel...@mpi-inf.mpg.de
> http://www.mpi-inf.mpg.de/~fmueller/
> 
> 
>   [[alternative HTML version deleted]]
> 
> ___
> 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

[Bioc-devel] git transition: unrelated histories

[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 keep syncing both to our github and to BioC. I tried the 
“--allow-unrelated-histories” option, but it did not really work: after 
resolving a bunch of merge conflicts, pulling again from the BioC git and 
resolving merge conflicts again, I am able to push to BioC. However, if I then 
want to merge from another branch of our github, I get unrelated histories 
again.
Has anyone else had this issue and knows how to resolve this best?

Best regards,
Fabian

PS: Here is the link to our github:
https://github.com/epigen/RnBeads.git 
__
Fabian Müller 
 Max Planck Institute for Informatics
 Computational Biology and Applied Algorithmics Department

 Saarland Informatics Campus
 Building E 1.4
 Room 509
 66123 Saarbrücken
 Germany

 Phone: +49 (681) 9325 3009
 Email:  fmuel...@mpi-inf.mpg.de
 http://www.mpi-inf.mpg.de/~fmueller/


[[alternative HTML version deleted]]

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel