I would do a git fetch --all # get all branches git pull upstream master # pulls changes from Bioconductor git server
# resolve any merge conflicts that arise. It is good practice to always pull from origin and upstream before making any changes to code to make sure the code base is updated. Let us know if you have any further trouble. Lori Shepherd Bioconductor Core Team Roswell Park Comprehensive Cancer Center Department of Biostatistics & Bioinformatics Elm & Carlton Streets Buffalo, New York 14263 ________________________________ From: minoo ashtiani <ashtiani.mi...@gmail.com> Sent: Monday, March 23, 2020 6:26 AM To: Shepherd, Lori <lori.sheph...@roswellpark.org>; bioc-devel@r-project.org <bioc-devel@r-project.org> Subject: Re: Bioconductor package IMMAN Hi Lori, Thanks for the update. I edited the vignette in which the platform error comes from that. I updated the by using 1. git push origin master 2. command and it was OK, however when I wanted to run the second command line 1. git push upstream master 2. I faced error and I have no idea how to fix it. Here is a summary of the output of the two commands line: $ git push origin master Enumerating objects: 9, done. Counting objects: 100% (9/9), done. Delta compression using up to 4 threads Compressing objects: 100% (4/4), done. Writing objects: 100% (5/5), 409 bytes | 136.00 KiB/s, done. Total 5 (delta 3), reused 0 (delta 0) To git.bioconductor.org:packages/IMMAN.git 05b59cb..01a56eb master -> master $ git push upstream master To https://github.com/Minoo-ASTY/IMMAN.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/Minoo-ASTY/IMMAN.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 any problem with or getting the output of "git push original master" is enough? All the bests, Minoo On Mon, Mar 16, 2020 at 2:50 PM Shepherd, Lori <lori.sheph...@roswellpark.org<mailto:lori.sheph...@roswellpark.org>> wrote: Dear package maintainer, Please be aware your package continues to fail on Bioconductor devel 3.11. Bioconductor release is scheduled for Tuesday April 28th. We appreciate your quick response in this matter. If your package remains broken we will begin the deprecation process to remove the package from Bioconductor. http://bioconductor.org/checkResults/devel/bioc-LATEST/IMMAN/ Lori Shepherd Bioconductor Core Team Roswell Park Comprehensive Cancer Center Department of Biostatistics & Bioinformatics Elm & Carlton Streets Buffalo, New York 14263 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. -- Minoo Ashtiani, Research Assistant @ Russell Lab, Heidelberg University +491605667176 Germany minoo.ashti...@bioquant.uni-heidelberg.de<mailto:minoo.ashti...@bioquant.uni-heidelberg.de> for accessing papers: https://scholar.google.com/citations?user=nnCwxpEAAAAJ&hl=en 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
