[Bioc-devel] EXTERNAL: Re: Cannot update my development package to Bioconductor

[Turaga, Nitesh]

Hi Christian,

Marcel is correct. The documentation is given here, http://bioconductor.org/developers/how-to/git/pull-upstream-changes/.

Best,

Nitesh 

> On May 14, 2018, at 6:22 PM, Marcel Ramos <Marcel.Ramos at roswellpark.org> wrote:
> 
> Hi Christian,
> 
> It looks like you have to do
> 
> *git pull upstream master *
> 
> according to your `git remote -v`.
> 
> Regards,
> 
> Marcel
> 
> 
> On 05/14/2018 04:21 PM, cstrato wrote:
>> Dear Nitesh,
>> 
>> Thank you for your fast reply. Here is  what I tried now,
>> including using 'git pull':
>> 
>> $ cd /Volumes/T3Data/CRAN/GIT/xps
>> 
>> $ git checkout master
>> Already on 'master'
>> Your branch is up-to-date with 'origin/master'.
>> 
>> $ git pull
>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>> Already up-to-date.
>> 
>> $ git commit DESCRIPTION
>> On branch master
>> Your branch is up-to-date with 'origin/master'.
>> Untracked files:
>>         .DS_Store
>>         xps/
>> 
>> nothing added to commit but untracked files present
>> 
>> $ git push
>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>> Everything up-to-date
>> 
>> $ git push origin master
>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>> Everything up-to-date
>> 
>> $ git push upstream master
>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>> To git.bioconductor.org:packages/xps
>>  ! [rejected]        master -> master (fetch first)
>> error: failed to push some refs to
>> 'git at git.bioconductor.org:packages/xps'
>> hint: Updates were rejected because the remote contains work that you do
>> hint: not have locally. This is usually caused by another repository
>> pushing
>> hint: to the same ref. You may want to first integrate the remote changes
>> hint: (e.g., 'git pull ...') before pushing again.
>> hint: See the 'Note about fast-forwards' in 'git push --help' for
>> details.
>> 
>> 
>> Since I still get the same error I tried the following:
>> 
>> $ git merge upstream/master
>> merge: upstream/master - not something we can merge
>> 
>> $ git remote -v
>> origin  git at github.com:cstrato/xps.git (fetch)
>> origin  git at github.com:cstrato/xps.git (push)
>> upstream        git at git.bioconductor.org:packages/xps (fetch)
>> upstream        git at git.bioconductor.org:packages/xps (push)
>> 
>> $ git push -u origin master
>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>> Branch master set up to track remote branch master from origin.
>> Everything up-to-date
>> 
>> $ git push upstream master
>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>> To git.bioconductor.org:packages/xps
>>  ! [rejected]        master -> master (fetch first)
>> error: failed to push some refs to
>> 'git at git.bioconductor.org:packages/xps'
>> hint: Updates were rejected because the remote contains work that you do
>> hint: not have locally. This is usually caused by another repository
>> pushing
>> hint: to the same ref. You may want to first integrate the remote changes
>> hint: (e.g., 'git pull ...') before pushing again.
>> hint: See the 'Note about fast-forwards' in 'git push --help' for
>> details.
>> 
>> 
>> Once again I get the same error.
>> 
>> - Do you know what might be the reason?
>> 
>> - Furthermore, why is it not possible to follow exactly the guidelines
>> in:
>> http://bioconductor.org/developers/how-to/git/push-to-github-bioc/
>> 
>> Best regards,
>> Christian
>> 
>> 
>> On 05/14/18 20:50, Turaga, Nitesh wrote:
>>> Did you try to ‘git pull’ as mentioned in the error message?
>>> 
>>> Best,
>>> 
>>> Nitesh
>>> 
>>>> On May 14, 2018, at 2:48 PM, cstrato <cstrato at aon.at> wrote:
>>>> 
>>>> Dear GIT experts,
>>>> 
>>>> On Saturday I wanted to update my development package to xps_1.41.1,
>>>> however until now it was not updated in the 'Multiple platform
>>>> build/check report' although I could confirm the changes with
>>>> Firefox: https://github.com/cstrato/xps
>>>> 
>>>> 
>>>> For this reason I tried today to update my development package to
>>>> xps_1.41.2.
>>>> 
>>>> I did follow exactly the guidelines of:
>>>> http://bioconductor.org/developers/how-to/git/push-to-github-bioc/
>>>> 
>>>> 
>>>> Here are the results:
>>>> 
>>>> $ cd /Volumes/T3Data/CRAN/GIT/xps
>>>> 
>>>> $ git remote -v
>>>> origin  git at github.com:cstrato/xps.git (fetch)
>>>> origin  git at github.com:cstrato/xps.git (push)
>>>> upstream        git at git.bioconductor.org:packages/xps (fetch)
>>>> upstream        git at git.bioconductor.org:packages/xps (push)
>>>> 
>>>> $ git checkout master
>>>> Already on 'master'
>>>> Your branch is up-to-date with 'origin/master'.
>>>> 
>>>> $ git add -v DESCRIPTION
>>>> add 'DESCRIPTION'
>>>> 
>>>> $ git add -v NEWS
>>>> add 'NEWS'
>>>> 
>>>> $ git commit -m "update for NEWS"
>>>> [master cf326be] update for NEWS
>>>> 2 files changed, 6 insertions(+), 1 deletion(-)
>>>> 
>>>> $ git push origin master
>>>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>>>> Counting objects: 4, done.
>>>> Delta compression using up to 8 threads.
>>>> Compressing objects: 100% (4/4), done.
>>>> Writing objects: 100% (4/4), 375 bytes | 0 bytes/s, done.
>>>> Total 4 (delta 3), reused 0 (delta 0)
>>>> remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
>>>> To github.com:cstrato/xps.git
>>>>    7616d60..cf326be  master -> master
>>>> 
>>>> $ git push upstream master
>>>> Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
>>>> To git.bioconductor.org:packages/xps
>>>> ! [rejected]        master -> master (fetch first)
>>>> error: failed to push some refs to
>>>> 'git at git.bioconductor.org:packages/xps'
>>>> hint: Updates were rejected because the remote contains work that
>>>> you do
>>>> hint: not have locally. This is usually caused by another repository
>>>> pushing
>>>> hint: to the same ref. You may want to first integrate the remote
>>>> changes
>>>> hint: (e.g., 'git pull ...') before pushing again.
>>>> hint: See the 'Note about fast-forwards' in 'git push --help' for
>>>> details.
>>>> 
>>>> 
>>>> # check in Firefox
>>>> https://github.com/cstrato/xps
>>>> 
>>>> 
>>>> For some reason I get the same error as on Saturday when trying to do:
>>>> $ git push upstream master
>>>> 
>>>> Can you tell me what may be the reason for this error?
>>>> ('git push --help' was not very helpful for me)
>>>> 
>>>> Best regards,
>>>> Christian
>>>> _._._._._._._._._._._._._._._._._._
>>>> C.h.r.i.s.t.i.a.n   S.t.r.a.t.o.w.a
>>>> V.i.e.n.n.a           A.u.s.t.r.i.a
>>>> e.m.a.i.l:        cstrato at aon.at
>>>> _._._._._._._._._._._._._._._._._._
>>>> 
>>>> _______________________________________________
>>>> 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.
>>> 
>> 
>> _______________________________________________
>> 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...{{dropped:4}}
> 
> _______________________________________________
> 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.