The editor has been updated to markdown! Please see more info at: Tutorial: Updated Support Site Editor

Question: Updating release branch from devel
gravatar for Erik Wright
9 months ago by
Erik Wright130
Erik Wright130 wrote:

The latest version of RSQLite (on CRAN) broke my package, DECIPHER, in both the devel and release branches.  I have patched the devel branch so that it should work in the next build, but I do not understand the instructions on how to merge the changes into the release branch.  Does anyone have the minimal set of git commands to sync the release branch with devel, while updating the version number in release?  Any assistance would be much appreciated.  Apologies in advance that I am not a git wizard.

git • 208 views
ADD COMMENTlink modified 9 months ago by Martin Morgan ♦♦ 22k • written 9 months ago by Erik Wright130
Answer: Updating release branch from devel
gravatar for Martin Morgan
9 months ago by
Martin Morgan ♦♦ 22k
United States
Martin Morgan ♦♦ 22k wrote:

Please ask questions about package development on the bioc-devel mailing list. What I would do is check-out and pull any upstream changes, where the git merge is on all remotes in your repository, git remote -v, which I've summarized as '<remote>'

git checkout RELEASE_3_7
git fetch --all
git merge <remote>/RELEASE_3_7

I'd then figure out the hash codes of the commits I want to port, excluding the version bump if I'd structured it that way

git log master   # find the commit hash(es), <commit>
git cherry-pick <commit>    # or maybe <commit>..<commit>, or <commit> <commit> ...

Then create a version bump commit

vi DESCRIPTION  # correct version bump for RELEASE_3_7
git commit -a

and finally push to all remotes

git push <remote>/RELEASE_3_7
ADD COMMENTlink written 9 months ago by Martin Morgan ♦♦ 22k

It looks like that worked!  Thanks for your help.

ADD REPLYlink written 9 months ago by Erik Wright130
Please log in to add an answer.


Use of this site constitutes acceptance of our User Agreement and Privacy Policy.
Powered by Biostar version 16.09
Traffic: 165 users visited in the last hour