Just as a follow up to the mailing list. This issue has been resolved from the Bioconductor end. The commit's were reset to during the release time, and the branches are clean and as expected.
Raphael, please sync your branches on Github to the ones on Bioconductor before making changes and pushing. There are helpful docs here http://bioconductor.org/developers/how-to/git/, to guide you through exactly what you need. 1. http://bioconductor.org/developers/how-to/git/sync-existing-repositories/ 2. http://bioconductor.org/developers/how-to/git/push-to-github-bioc/ > On Jan 15, 2020, at 10:15 AM, ni41435_ca <nitesh.tur...@roswellpark.org> > wrote: > > Hi Raphael, > > After looking at your branch, the best I can do reset your branch to the > release. > > 1. Please pay attention to the merge conflicts when you are pushing to the > bioconductor git repository. > > 2. To be clear, for the "master" branch, I can set it to the commit > cf86353ab41c0a2a6c6b7428dd869d48504046cd. > > commit cf86353ab41c0a2a6c6b7428dd869d48504046cd (origin/master, origin/HEAD) > Author: Nitesh Turaga <nitesh.tur...@gmail.com> > Date: Tue Oct 29 13:43:47 2019 -0400 > > bump x.y.z version to odd y after creation of RELEASE_3_10 branch > > > 3. And "RELEASE_3_10" , To commit number > a724b95802b94cb096b592d716ddaf2b263e71bd > > > commit a724b95802b94cb096b592d716ddaf2b263e71bd > Author: Nitesh Turaga <nitesh.tur...@gmail.com> > Date: Tue Oct 29 13:12:15 2019 -0400 > > bump x.y.z version to even y prior to creation of RELEASE_3_10 branch > > > 4. It will be in your court again, to make sure that the RELEASE version > number is EVEN numbered and "master" version number is odd. Take a look at > http://bioconductor.org/developers/how-to/version-numbering/. > > 5. You will have to make your changes again wherever needed. > > > If you have any questions please let me know. > > Best, > > Nitesh > > >> On Jan 15, 2020, at 10:02 AM, Raphael Bonnet >> <raphael.bon...@univ-cotedazur.fr> wrote: >> >> Hi, >> >> Thank you for your response, >> >> here it is, >> >> https://github.com/Peyronlab/MACSQuantifyR >> >> Best, >> >> Raphaël >> >> Le 15/01/2020 à 15:56, Turaga, Nitesh a écrit : >>> Hi Raphael, >>> >>> Please send me the link to your Github repository. I'll take a look at it >>> and see if it can be fixed without a force push. >>> >>> The release commits are important part of the package's git log, so I'll >>> make sure everything is in order before syncing the two. >>> >>> Best, >>> >>> Nitesh >>> >>>> On Jan 14, 2020, at 5:47 AM, Raphael Bonnet >>>> <raphael.bon...@univ-cotedazur.fr> wrote: >>>> >>>> Hi, >>>> >>>> I just abandoned changed I made to correct a bug that arose a few days ago >>>> on some .Rd files in my package about colors. >>>> >>>> I tried to pushed changes and did a real mess with bump version in the >>>> process. >>>> >>>> I reverted back to first acceptance commit, just before my first changes. >>>> Forced push on origin, and I read on the doc that I should email you to >>>> force push it on bioconductor. >>>> >>>> Many thanks for your reply, >>>> >>>> >>>> >>>> -- >>>> Raphaël Bonnet >>> >>> >>> 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. _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
