[Bioc-devel] Merging master to RELEASE brance

[Shepherd, Lori]

The RELEASE_3_6 branch is frozen and cannot be updated but I assume you mean RELEASE_3_7 ...


For the record,  unless these changes are bug corrections it is not recommended to update the RELEASE_3_7 branch.


The easiest and safest way is to cherry-pick commits from the master branch to your RELEASE_3_7 branch and adjusting any versions bumps to be appropriate for release.


See

http://bioconductor.org/developers/how-to/git/bug-fix-in-release-and-devel/

http://bioconductor.org/developers/how-to/version-numbering/






Lori Shepherd

Bioconductor Core Team

Roswell Park Cancer Institute

Department of Biostatistics & Bioinformatics

Elm & Carlton Streets

Buffalo, New York 14263

________________________________
From: Bioc-devel <bioc-devel-bounces using r-project.org> on behalf of Christian Page <page.ntnu using gmail.com>
Sent: Monday, July 2, 2018 1:48:53 PM
To: bioc-devel using r-project.org
Subject: [Bioc-devel] Merging master to RELEASE brance

Hi,

What are it easiest (and safest) way to merge to updates from the devel
(master) branch to the RELEASE_3_6 branch in git?

Best,
Christian

        [[alternative HTML version deleted]]

_______________________________________________
Bioc-devel using 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]]