Updating release branch from devel
1
0
Entering edit mode
Erik Wright ▴ 150
@erik-wright-14386
Last seen 6 months ago
United States

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 • 1.7k views
ADD COMMENT
2
Entering edit mode
@martin-morgan-1513
Last seen 3 months ago
United States

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 COMMENT
1
Entering edit mode

It looks like that worked!  Thanks for your help.

ADD REPLY

Login before adding your answer.

Traffic: 715 users visited in the last hour
Help About
FAQ
Access RSS
API
Stats

Use of this site constitutes acceptance of our User Agreement and Privacy Policy.

Powered by the version 2.3.6