Hi Sarah, The release branch is meant for bug fixes that ensure the stability of the code. It does not usually include 'updates' from the devel.
The way to cleanly do this is to hard reset to a previous commit. The commit where your packages version was bumped for the 3.12 release. You can then force push the release branch to your GitHub repository RELEASE_3_12 branch. https://bioconductor.org/developers/how-to/git/abandon-changes/ <https://bioconductor.org/developers/how-to/git/abandon-changes/> After emailing Nitesh and he would apply a force push to the Bioc git repo. You will then be able to apply your changes from the devel branch by cherry-picking those changes** onto the release branch. ** your changes in the devel branch should be atomic, meaning they do not include version bumps, so that cherry-picking is easier, if that is not the case you may have to apply a diff or manually update the version. https://bioconductor.org/developers/how-to/git/bug-fix-in-release-and-devel/ <https://bioconductor.org/developers/how-to/git/bug-fix-in-release-and-devel/> Hope that helps. Best, Marcel On 3/22/21 4:43 PM, Sarah Voisin wrote: > Hi, > > I have updated the master branch of my MEAT package yesterday ( > https://github.com/sarah-voisin/MEAT), and I tried updating the release > branch as well (RELEASE_3_12), but I must have messed up since the release > branch is now 7 commits behind master and 3 commits ahead, and I am stuck. > How do I do this again cleanly so I can push all changes from the master > branch to the release branch without messing up further? > > Thank you for your help. > > Kind regards, > > *Sarah Voisin* > *Senior Lecturer* > Institute for Health and Sport (IHES) > Victoria University, Footscray Park Campus, VIC 3011 Australia > *Email*: sarah.voisin.ae...@gmail.com > *Office phone*: +61 3 9919 5744 > > [[alternative HTML version deleted]] > > _______________________________________________ > Bioc-devel@r-project.org mailing list > https://stat.ethz.ch/mailman/listinfo/bioc-devel --- Marcel Ramos Bioconductor Core Team Roswell Park Comprehensive Cancer Center Dept. of Biostatistics & Bioinformatics Elm St. & Carlton St. Buffalo, New York 14263 This email message may contain legally privileged and/or...{{dropped:4}} _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
