Hi Nitesh,
I read but I just wanted to be sure.
So, I typed:
git pull upstream master
Update the Version in DESCRIPTION
git add .
git commit -m "new message"
git push upstream master

and, I hope that everything will be ok now.
Many Thanks Nitesh!
Mattia


________________________________
Da: Turaga, Nitesh <nitesh.tur...@roswellpark.org>
Inviato: marted� 12 dicembre 2017 16:35
A: Mattia Chiesa
Cc: bioc-devel@r-project.org
Oggetto: Re: [Bioc-devel] DaMiRseq: error while pushing

Hi Mattia,

If you read the �error� and �hint� messages carefully, it says do a

> hint: (e.g., 'git pull ...') before pushing again.

Did you try that?

Best,

Nitesh

> On Dec 12, 2017, at 10:21 AM, Mattia Chiesa <mattia.chi...@hotmail.it> wrote:
>
> Dear All,
> I am the mantainer of the DaMiRseq package.
> I performed some relevant modificantions in the package (i.e. added 
> functions, added the CITATION file, updated vignette and NEWS file) and now 
> I'm ready to push (from a local folder to github and Bioconductor).
> So, as usually, I typed:
> git add .
> git commit -m "message"
> git push origin master
> git push upstream master
> (and typed the password)
>
> Everything was ok for github (origin) but for Bioconductor an error occured:
>
> Enter passphrase for key '/c/Users/mchiesa/.ssh/id_rsa':
> To git.bioconductor.org:packages/DaMiRseq.git
> ! [rejected]        master -> master (fetch first)
> error: failed to push some refs to 
> 'g...@git.bioconductor.org:packages/DaMiRseq.git'
> 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.
>
> What should I do?
> Thanks in advance,
> Mattia
>
>
>        [[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

Reply via email to