Re: [Bioc-devel] COHCAP GitHub Update

[Sean Davis]

Hi, Charles. See replies inline.

On Mon, Sep 4, 2017 at 3:30 PM, Charles Warden  wrote:

> Hi Sean,
>
> I'm admittedly on a different computer now, but I still get an error
> message (although it is different than the last one):
>
> git clone g...@git.bioconductor.org:packages/COHCAP.git
> Cloning into 'COHCAP'...
> Permission denied (publickey).
> fatal: Could not read from remote repository.
>
> Please make sure you have the correct access rights
> and the repository exists.
>

This error means that there is a problem with your git ssh key. It could be
that your private key is not present on the new computer or that the ssh
key on Bioconductor has not been registered. Given the error below, it
appears that at least one ssh key is working.


>
> Also, there was a lot of text in the previous message, but I tried
> following the commands to merge and update the Bioconductor and GitHub
> COHCAP repositories.  On that computer (the computer where I defined the
> ssh key), I could run "git remote add upstream g...@git.bioconductor.org:
> packages/COHCAP.git", but I ran into a problem at the push step:
>
> COHCAP cwarden$ git push upstream master
>
> To g...@git.bioconductor.org:packages/COHCAP.git
>
>  ! [rejected]master -> master (non-fast-forward)
>
> error: failed to push some refs to 'g...@git.bioconductor.org:
> packages/COHCAP.git'
>
> hint: Updates were rejected because the tip of your current branch is
> behind
>
> hint: its remote counterpart. Integrate the remote changes (e.g.
>
> hint: 'git pull ...') before pushing again.
>

You can often follow the instructions suggested by "hints" given by git. In
this case, it appears that there are some commits present at Bioconductor
that are not present in your local clone. Doing a `git pull` will fetch and
merge those changes. Assuming there are no merge conflicts, you should then
be able to push.


>
>
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>
> Is there a way that I should modify the ssh "git clone
> g...@git.bioconductor.org:packages/COHCAP.git" command?
>

You have had a few separate issues on this thread. My last comment about
`git pull` means that your first two problems (typo in the URL, missing or
mismatched ssh key) were overcome already. I'd proceed from there.

Hope that helps,
Sean



>
> Thanks,
> Charles
>
> On Mon, Sep 4, 2017 at 11:41 AM, Sean Davis  wrote:
>
>> Hi, Charles.
>>
>> The command is slightly off. Note the first '/' is a ':'.  This worked
>> for me:
>>
>> git clone g...@git.bioconductor.org:packages/COHCAP.git
>> Cloning into 'COHCAP'...
>> remote: Counting objects: 485, done.
>> remote: Compressing objects: 100% (479/479), done.
>> remote: Total 485 (delta 329), reused 0 (delta 0)
>> Receiving objects: 100% (485/485), 104.78 KiB | 0 bytes/s, done.
>> Resolving deltas: 100% (329/329), done.
>>
>> Sean
>>
>>
>> On Mon, Sep 4, 2017 at 2:15 PM, Charles Warden 
>> wrote:
>>
>>> Hi Nitesh,
>>>
>>> Thanks.  Unfortunately, I can't connect to the Bioconductor repository
>>> that
>>> way:
>>>
>>>
>>> *cwarden$ git clone g...@git.bioconductor.org/packages/COHCAP.git
>>> *
>>>
>>> *fatal: repository 'g...@git.bioconductor.org/packages/COHCAP.git
>>> ' does not exist*
>>>
>>>
>>> However, I can connect and update the GitHub repository with the SSH
>>> commands:
>>>
>>> cwarden$ git clone g...@github.com:cwarden45/COHCAP.git
>>>
>>> Cloning into 'COHCAP'...
>>>
>>> Saving password to keychain failed
>>>
>>> Identity added: /Users/cwarden/.ssh/id_rsa ((null))
>>>
>>> remote: Counting objects: 59, done.
>>>
>>> remote: Compressing objects: 100% (53/53), done.
>>>
>>> remote: Total 59 (delta 9), reused 3 (delta 2), pack-reused 0
>>>
>>> Receiving objects: 100% (59/59), 56.83 KiB | 0 bytes/s, done.
>>>
>>> Resolving deltas: 100% (9/9), done.
>>>
>>> Checking connectivity... done.
>>>
>>> BR11252:COHCAP cwarden$ git status
>>>
>>> On branch master
>>>
>>> Your branch is up-to-date with 'origin/master'.
>>>
>>> Changes not staged for commit:
>>>
>>>   (use "git add ..." to update what will be committed)
>>>
>>>   (use "git checkout -- ..." to discard changes in working
>>> directory)
>>>
>>>
>>> modified:   CHANGES
>>>
>>>
>>> no changes added to commit (use "git add" and/or "git commit -a")
>>>
>>> BR11252:COHCAP cwarden$ git commit -a -m "test commit"
>>>
>>> [master f2aded7] test commit
>>>
>>>  1 file changed, 1 insertion(+)
>>>
>>> BR11252:COHCAP cwarden$ git push
>>>
>>> Warning: Permanently added the RSA host key for IP address
>>> '192.30.255.112'
>>> to the list of known hosts.
>>>
>>> Counting objects: 3, done.
>>>
>>> Delta compression using up to 8 threads.
>>>
>>> Compressing objects: 100% (3/3), done.
>>>
>>> Writing objects: 100% (3/3), 302 bytes | 0 bytes/s, done.
>>>
>>> Total 3 (delta 2), reused 0 (delta 0)
>>>
>>> remote: Resolving deltas: 100% (2/2), completed with 2 local objec

Re: [Bioc-devel] COHCAP GitHub Update

[Charles Warden]

Hi Sean,

I'm admittedly on a different computer now, but I still get an error
message (although it is different than the last one):

git clone g...@git.bioconductor.org:packages/COHCAP.git
Cloning into 'COHCAP'...
Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

Also, there was a lot of text in the previous message, but I tried
following the commands to merge and update the Bioconductor and GitHub
COHCAP repositories.  On that computer (the computer where I defined the
ssh key), I could run "git remote add upstream g...@git.bioconductor.org:
packages/COHCAP.git", but I ran into a problem at the push step:

COHCAP cwarden$ git push upstream master

To g...@git.bioconductor.org:packages/COHCAP.git

 ! [rejected]master -> master (non-fast-forward)

error: failed to push some refs to 'g...@git.bioconductor.org:
packages/COHCAP.git'

hint: Updates were rejected because the tip of your current branch is behind

hint: its remote counterpart. Integrate the remote changes (e.g.

hint: 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Is there a way that I should modify the ssh "git clone
g...@git.bioconductor.org:packages/COHCAP.git" command?

Thanks,
Charles

On Mon, Sep 4, 2017 at 11:41 AM, Sean Davis  wrote:

> Hi, Charles.
>
> The command is slightly off. Note the first '/' is a ':'.  This worked for
> me:
>
> git clone g...@git.bioconductor.org:packages/COHCAP.git
> Cloning into 'COHCAP'...
> remote: Counting objects: 485, done.
> remote: Compressing objects: 100% (479/479), done.
> remote: Total 485 (delta 329), reused 0 (delta 0)
> Receiving objects: 100% (485/485), 104.78 KiB | 0 bytes/s, done.
> Resolving deltas: 100% (329/329), done.
>
> Sean
>
>
> On Mon, Sep 4, 2017 at 2:15 PM, Charles Warden 
> wrote:
>
>> Hi Nitesh,
>>
>> Thanks.  Unfortunately, I can't connect to the Bioconductor repository
>> that
>> way:
>>
>>
>> *cwarden$ git clone g...@git.bioconductor.org/packages/COHCAP.git
>> *
>>
>> *fatal: repository 'g...@git.bioconductor.org/packages/COHCAP.git
>> ' does not exist*
>>
>>
>> However, I can connect and update the GitHub repository with the SSH
>> commands:
>>
>> cwarden$ git clone g...@github.com:cwarden45/COHCAP.git
>>
>> Cloning into 'COHCAP'...
>>
>> Saving password to keychain failed
>>
>> Identity added: /Users/cwarden/.ssh/id_rsa ((null))
>>
>> remote: Counting objects: 59, done.
>>
>> remote: Compressing objects: 100% (53/53), done.
>>
>> remote: Total 59 (delta 9), reused 3 (delta 2), pack-reused 0
>>
>> Receiving objects: 100% (59/59), 56.83 KiB | 0 bytes/s, done.
>>
>> Resolving deltas: 100% (9/9), done.
>>
>> Checking connectivity... done.
>>
>> BR11252:COHCAP cwarden$ git status
>>
>> On branch master
>>
>> Your branch is up-to-date with 'origin/master'.
>>
>> Changes not staged for commit:
>>
>>   (use "git add ..." to update what will be committed)
>>
>>   (use "git checkout -- ..." to discard changes in working
>> directory)
>>
>>
>> modified:   CHANGES
>>
>>
>> no changes added to commit (use "git add" and/or "git commit -a")
>>
>> BR11252:COHCAP cwarden$ git commit -a -m "test commit"
>>
>> [master f2aded7] test commit
>>
>>  1 file changed, 1 insertion(+)
>>
>> BR11252:COHCAP cwarden$ git push
>>
>> Warning: Permanently added the RSA host key for IP address
>> '192.30.255.112'
>> to the list of known hosts.
>>
>> Counting objects: 3, done.
>>
>> Delta compression using up to 8 threads.
>>
>> Compressing objects: 100% (3/3), done.
>>
>> Writing objects: 100% (3/3), 302 bytes | 0 bytes/s, done.
>>
>> Total 3 (delta 2), reused 0 (delta 0)
>>
>> remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
>>
>> To g...@github.com:cwarden45/COHCAP.git
>>
>>5285d59..f2aded7  master -> master
>>
>> *If it helps with troubleshooting, I can also try to update the
>> Bioconductor repository as an upstream link to the GitHub repository, but
>> that also does not work (at the push step, see below):*
>>
>>
>> cwarden$ git clone g...@github.com:cwarden45/COHCAP.git
>>
>> Cloning into 'COHCAP'...
>>
>> remote: Counting objects: 63, done.
>>
>> remote: Compressing objects: 100% (55/55), done.
>>
>> remote: Total 63 (delta 12), reused 7 (delta 4), pack-reused 0
>>
>> Receiving objects: 100% (63/63), 57.24 KiB | 0 bytes/s, done.
>>
>> Resolving deltas: 100% (12/12), done.
>>
>> Checking connectivity... done.
>>
>> cwarden$ cd COHCAP
>>
>> COHCAP cwarden$ git remote -v
>>
>> origin g...@github.com:cwarden45/COHCAP.git (fetch)
>>
>> origin g...@github.com:cwarden45/COHCAP.git (push)
>>
>> COHCAP cwarden$ git remote add upstream g...@git.bioconductor.org:
>> packages/COHCAP.git
>>
>> BR11252:COHCAP cwarden$ git remote -v
>>
>> origin g...@github.com:cwarden45/COHCAP.git (fetch)
>>
>> origin g...@

Re: [Bioc-devel] COHCAP GitHub Update

[Sean Davis]

Hi, Charles.

The command is slightly off. Note the first '/' is a ':'.  This worked for
me:

git clone g...@git.bioconductor.org:packages/COHCAP.git
Cloning into 'COHCAP'...
remote: Counting objects: 485, done.
remote: Compressing objects: 100% (479/479), done.
remote: Total 485 (delta 329), reused 0 (delta 0)
Receiving objects: 100% (485/485), 104.78 KiB | 0 bytes/s, done.
Resolving deltas: 100% (329/329), done.

Sean


On Mon, Sep 4, 2017 at 2:15 PM, Charles Warden  wrote:

> Hi Nitesh,
>
> Thanks.  Unfortunately, I can't connect to the Bioconductor repository that
> way:
>
>
> *cwarden$ git clone g...@git.bioconductor.org/packages/COHCAP.git
> *
>
> *fatal: repository 'g...@git.bioconductor.org/packages/COHCAP.git
> ' does not exist*
>
> However, I can connect and update the GitHub repository with the SSH
> commands:
>
> cwarden$ git clone g...@github.com:cwarden45/COHCAP.git
>
> Cloning into 'COHCAP'...
>
> Saving password to keychain failed
>
> Identity added: /Users/cwarden/.ssh/id_rsa ((null))
>
> remote: Counting objects: 59, done.
>
> remote: Compressing objects: 100% (53/53), done.
>
> remote: Total 59 (delta 9), reused 3 (delta 2), pack-reused 0
>
> Receiving objects: 100% (59/59), 56.83 KiB | 0 bytes/s, done.
>
> Resolving deltas: 100% (9/9), done.
>
> Checking connectivity... done.
>
> BR11252:COHCAP cwarden$ git status
>
> On branch master
>
> Your branch is up-to-date with 'origin/master'.
>
> Changes not staged for commit:
>
>   (use "git add ..." to update what will be committed)
>
>   (use "git checkout -- ..." to discard changes in working directory)
>
>
> modified:   CHANGES
>
>
> no changes added to commit (use "git add" and/or "git commit -a")
>
> BR11252:COHCAP cwarden$ git commit -a -m "test commit"
>
> [master f2aded7] test commit
>
>  1 file changed, 1 insertion(+)
>
> BR11252:COHCAP cwarden$ git push
>
> Warning: Permanently added the RSA host key for IP address '192.30.255.112'
> to the list of known hosts.
>
> Counting objects: 3, done.
>
> Delta compression using up to 8 threads.
>
> Compressing objects: 100% (3/3), done.
>
> Writing objects: 100% (3/3), 302 bytes | 0 bytes/s, done.
>
> Total 3 (delta 2), reused 0 (delta 0)
>
> remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
>
> To g...@github.com:cwarden45/COHCAP.git
>
>5285d59..f2aded7  master -> master
>
> *If it helps with troubleshooting, I can also try to update the
> Bioconductor repository as an upstream link to the GitHub repository, but
> that also does not work (at the push step, see below):*
>
> cwarden$ git clone g...@github.com:cwarden45/COHCAP.git
>
> Cloning into 'COHCAP'...
>
> remote: Counting objects: 63, done.
>
> remote: Compressing objects: 100% (55/55), done.
>
> remote: Total 63 (delta 12), reused 7 (delta 4), pack-reused 0
>
> Receiving objects: 100% (63/63), 57.24 KiB | 0 bytes/s, done.
>
> Resolving deltas: 100% (12/12), done.
>
> Checking connectivity... done.
>
> cwarden$ cd COHCAP
>
> COHCAP cwarden$ git remote -v
>
> origin g...@github.com:cwarden45/COHCAP.git (fetch)
>
> origin g...@github.com:cwarden45/COHCAP.git (push)
>
> COHCAP cwarden$ git remote add upstream g...@git.bioconductor.org:
> packages/COHCAP.git
>
> BR11252:COHCAP cwarden$ git remote -v
>
> origin g...@github.com:cwarden45/COHCAP.git (fetch)
>
> origin g...@github.com:cwarden45/COHCAP.git (push)
>
> upstream g...@git.bioconductor.org:packages/COHCAP.git (fetch)
>
> upstream g...@git.bioconductor.org:packages/COHCAP.git (push)
>
> COHCAP cwarden$ git fetch upstream
>
> warning: no common commits
>
> remote: Counting objects: 485, done.
>
> remote: Compressing objects: 100% (479/479), done.
>
> remote: Total 485 (delta 328), reused 0 (delta 0)
>
> Receiving objects: 100% (485/485), 110.22 KiB | 0 bytes/s, done.
>
> Resolving deltas: 100% (328/328), done.
>
> From git.bioconductor.org:packages/COHCAP
>
>  * [new branch]  RELEASE_2_14 -> upstream/RELEASE_2_14
>
>  * [new branch]  RELEASE_3_0 -> upstream/RELEASE_3_0
>
>  * [new branch]  RELEASE_3_1 -> upstream/RELEASE_3_1
>
>  * [new branch]  RELEASE_3_2 -> upstream/RELEASE_3_2
>
>  * [new branch]  RELEASE_3_3 -> upstream/RELEASE_3_3
>
>  * [new branch]  RELEASE_3_4 -> upstream/RELEASE_3_4
>
>  * [new branch]  RELEASE_3_5 -> upstream/RELEASE_3_5
>
>  * [new branch]  master -> upstream/master
>
> COHCAP cwarden$ git merge upstream/master
>
> Auto-merging vignettes/COHCAP.Rnw
>
> CONFLICT (add/add): Merge conflict in vignettes/COHCAP.Rnw
>
> Auto-merging man/COHCAP.site.Rd
>
> CONFLICT (add/add): Merge conflict in man/COHCAP.site.Rd
>
> Auto-merging man/COHCAP.qc.Rd
>
> CONFLICT (add/add): Merge conflict in man/COHCAP.qc.Rd
>
> Auto-merging man/COHCAP.integrate.avg.by.site.Rd
>
> CONFLICT (add/add): Merge conflict in man/COHCAP.integrate.avg.by.site.Rd
>
> Auto-merging man/COHCAP.integrate.avg.by.island.Rd
>
> CONFLIC

Re: [Bioc-devel] COHCAP GitHub Update

[Charles Warden]

Hi Nitesh,

Thanks.  Unfortunately, I can't connect to the Bioconductor repository that
way:


*cwarden$ git clone g...@git.bioconductor.org/packages/COHCAP.git
*

*fatal: repository 'g...@git.bioconductor.org/packages/COHCAP.git
' does not exist*

However, I can connect and update the GitHub repository with the SSH
commands:

cwarden$ git clone g...@github.com:cwarden45/COHCAP.git

Cloning into 'COHCAP'...

Saving password to keychain failed

Identity added: /Users/cwarden/.ssh/id_rsa ((null))

remote: Counting objects: 59, done.

remote: Compressing objects: 100% (53/53), done.

remote: Total 59 (delta 9), reused 3 (delta 2), pack-reused 0

Receiving objects: 100% (59/59), 56.83 KiB | 0 bytes/s, done.

Resolving deltas: 100% (9/9), done.

Checking connectivity... done.

BR11252:COHCAP cwarden$ git status

On branch master

Your branch is up-to-date with 'origin/master'.

Changes not staged for commit:

  (use "git add ..." to update what will be committed)

  (use "git checkout -- ..." to discard changes in working directory)


modified:   CHANGES


no changes added to commit (use "git add" and/or "git commit -a")

BR11252:COHCAP cwarden$ git commit -a -m "test commit"

[master f2aded7] test commit

 1 file changed, 1 insertion(+)

BR11252:COHCAP cwarden$ git push

Warning: Permanently added the RSA host key for IP address '192.30.255.112'
to the list of known hosts.

Counting objects: 3, done.

Delta compression using up to 8 threads.

Compressing objects: 100% (3/3), done.

Writing objects: 100% (3/3), 302 bytes | 0 bytes/s, done.

Total 3 (delta 2), reused 0 (delta 0)

remote: Resolving deltas: 100% (2/2), completed with 2 local objects.

To g...@github.com:cwarden45/COHCAP.git

   5285d59..f2aded7  master -> master

*If it helps with troubleshooting, I can also try to update the
Bioconductor repository as an upstream link to the GitHub repository, but
that also does not work (at the push step, see below):*

cwarden$ git clone g...@github.com:cwarden45/COHCAP.git

Cloning into 'COHCAP'...

remote: Counting objects: 63, done.

remote: Compressing objects: 100% (55/55), done.

remote: Total 63 (delta 12), reused 7 (delta 4), pack-reused 0

Receiving objects: 100% (63/63), 57.24 KiB | 0 bytes/s, done.

Resolving deltas: 100% (12/12), done.

Checking connectivity... done.

cwarden$ cd COHCAP

COHCAP cwarden$ git remote -v

origin g...@github.com:cwarden45/COHCAP.git (fetch)

origin g...@github.com:cwarden45/COHCAP.git (push)

COHCAP cwarden$ git remote add upstream g...@git.bioconductor.org:
packages/COHCAP.git

BR11252:COHCAP cwarden$ git remote -v

origin g...@github.com:cwarden45/COHCAP.git (fetch)

origin g...@github.com:cwarden45/COHCAP.git (push)

upstream g...@git.bioconductor.org:packages/COHCAP.git (fetch)

upstream g...@git.bioconductor.org:packages/COHCAP.git (push)

COHCAP cwarden$ git fetch upstream

warning: no common commits

remote: Counting objects: 485, done.

remote: Compressing objects: 100% (479/479), done.

remote: Total 485 (delta 328), reused 0 (delta 0)

Receiving objects: 100% (485/485), 110.22 KiB | 0 bytes/s, done.

Resolving deltas: 100% (328/328), done.

From git.bioconductor.org:packages/COHCAP

 * [new branch]  RELEASE_2_14 -> upstream/RELEASE_2_14

 * [new branch]  RELEASE_3_0 -> upstream/RELEASE_3_0

 * [new branch]  RELEASE_3_1 -> upstream/RELEASE_3_1

 * [new branch]  RELEASE_3_2 -> upstream/RELEASE_3_2

 * [new branch]  RELEASE_3_3 -> upstream/RELEASE_3_3

 * [new branch]  RELEASE_3_4 -> upstream/RELEASE_3_4

 * [new branch]  RELEASE_3_5 -> upstream/RELEASE_3_5

 * [new branch]  master -> upstream/master

COHCAP cwarden$ git merge upstream/master

Auto-merging vignettes/COHCAP.Rnw

CONFLICT (add/add): Merge conflict in vignettes/COHCAP.Rnw

Auto-merging man/COHCAP.site.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.site.Rd

Auto-merging man/COHCAP.qc.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.qc.Rd

Auto-merging man/COHCAP.integrate.avg.by.site.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.integrate.avg.by.site.Rd

Auto-merging man/COHCAP.integrate.avg.by.island.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.integrate.avg.by.island.Rd

Auto-merging man/COHCAP.denovo.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.denovo.Rd

Auto-merging man/COHCAP.avg.by.site.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.avg.by.site.Rd

Auto-merging man/COHCAP.avg.by.island.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.avg.by.island.Rd

Auto-merging man/COHCAP.annotate.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.annotate.Rd

Auto-merging man/COHCAP.BSSeq.preprocess.Rd

CONFLICT (add/add): Merge conflict in man/COHCAP.BSSeq.preprocess.Rd

Auto-merging NAMESPACE

CONFLICT (add/add): Merge conflict in NAMESPACE

Auto-merging DESCRIPTION

CONFLICT (add/add): Merge conflict in DESCRIPTION

Aut

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


From: Fabian M�ller 
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 
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 
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 
__
  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.



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