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.
It looks like that worked! Thanks for your help.