Hi Matthais, You DESCRIPTION file is malformed which is why the pre-receive hook did not catch the version number.
<<<<<<< HEAD Version: 1.5.2 Date: 2018-06-12 ======= Version: 1.7.0 Date: 2018-03-22 >>>>>>> 90a1811ecfe3bbc3d9594f32d54b006afb2d2ac5 This is from a “merge” and has to be corrected. Please check, http://bioconductor.org/developers/how-to/git/resolve-conflicts/. Best, Nitesh > On Jun 14, 2018, at 10:41 AM, Matthias Lienhard <lienh...@molgen.mpg.de> > wrote: > > Hi Nitesh, > > unfortunately the pre-receive hook did not caught the accidental decrease > from 1.7.0 to 1.5.2, but now prevents me from correcting it back to 1.7.1. > I did more local commits trying to resolve the issue already in the mean > time, so I cannot try your suggestion. > > Best, Matthias > > On 06/14/18 15:29, Turaga, Nitesh wrote: >> Hi Matthais, >> >> You can change your commit locally. Your version hasn’t been updated because >> the pre-receive hook has caught it. Just to further explain, “pre-receive” >> is before the the commit is received by the bioconductor server, so the >> version on the server is still correct and unchanged. >> >> You would need to edit your version on your local repository. Simply change >> the version number to a correct one and you should be able to push. If you >> are particular about your version numbers, and don’t want any bad versions >> along the way then you may try to amend your commit >> >> `git commit —amend` >> >> This works ONLY if the version bump was in most recent commit on your local >> branch. >> >> Let me know if this helps. If you have any further questions reply to this >> thread. >> >> Best, >> >> Nitesh >> >>> On Jun 14, 2018, at 9:14 AM, Matthias Lienhard <lienh...@molgen.mpg.de> >>> wrote: >>> >>> Hi all, >>> >>> I accidentally decreased the version of my package qsea in the master >>> branch from 1.7.0 to 1.5.2, which I cannot undo now, because of checks of >>> the pre-receive hook: >>> >>> git push upstream master >>> X11 forwarding request failed on channel 0 >>> Counting objects: 6, done. >>> Delta compression using up to 64 threads. >>> Compressing objects: 100% (6/6), done. >>> Writing objects: 100% (6/6), 642 bytes | 642.00 KiB/s, done. >>> Total 6 (delta 4), reused 0 (delta 0) >>> remote: Error: Illegal version bump from '1.5.2' to '1.7.1'. Check >>> remote: http://bioconductor.org/developers/how-to/version-numbering/ >>> remote: for details >>> To git.bioconductor.org:packages/qsea.git >>> ! [remote rejected] master -> master (pre-receive hook declined) >>> error: failed to push some refs to >>> 'g...@git.bioconductor.org:packages/qsea.git' >>> >>> What can I do to correct my mistake? >>> >>> Best regards, Matthias >>> >>> -- >>> Matthias Lienhard >>> Max Planck Institute for Molecular Genetics >>> Department of Computational Biology >>> Bioinformatics Group >>> Ihnestr. 63 - 73 >>> 14195 Berlin >>> phone: +49 (0)30 8413-1675 >>> >>> _______________________________________________ >>> 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. > > > -- > Matthias Lienhard > Max Planck Institute for Molecular Genetics > Department of Computational Biology > Bioinformatics Group > Ihnestr. 63 - 73 > 14195 Berlin > phone: +49 (0)30 8413-1675 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
