Re: [Bioc-devel] R CMD build error for 3.10 (but not 3.11)

2020-03-15 Thread L Rutter
Dear Lori and Nitesh: Thank you both for your support. I should clarify that the changes in the devel branch (unfortunately) do include new features in addition to correcting the original source of failure. This happened inadvertently due to me still building my git skills and also me adding featu

Re: [Bioc-devel] R CMD build error for 3.10 (but not 3.11)

2020-03-15 Thread Shepherd, Lori
Lindsay, please wait for niteshs response as there could be intracacies with the versioning git hook that I'm not aware of. Get Outlook for Android From: Bioc-devel on behalf of Shepherd, Lori Sent: Sunday, March 15, 2020 4:59:14 PM To:

Re: [Bioc-devel] R CMD build error for 3.10 (but not 3.11)

2020-03-15 Thread Shepherd, Lori
Hello, Nitesh I disagree. Given this is a bug correction and the release version is failing it is perfectly reasonable for them to merge the master branch in the RELEASE_3_10 branch as long as they change the version number before committing to the git.biconductor.org branch; The changes in t

Re: [Bioc-devel] R CMD build error for 3.10 (but not 3.11)

2020-03-15 Thread Turaga, Nitesh
You cannot merge your master branch into the RELEASE_3_10 branch. The version number will not match, and all the devel changes will go into the release. Instead, 1) git checkout RELEASE_3_10 2) Make the changes again in the RELEASE_3_10 branch. 3) git add 4) git commit -m "

Re: [Bioc-devel] R CMD build error for 3.10 (but not 3.11)

2020-03-15 Thread L Rutter
Dear Lori: Thank you for all your help. I am happy to say that the landing development page is now building without errors . I believe my GitHub master branch (1.3.3) and Bioconductor development branch are now the same. I am hoping to