Re: [Bioc-devel] Git mirror out of sync (LOBSTAHS package)

2017-06-29 Thread James Collins
Hi Martin: Thanks — I hadn’t thought of the ‘squash’ strategy before. Will give that a try next time. On a related note: I am concerned that my final commit to the release branch (version number bump to 1.2.1) did not trigger a new release build last night. Could this be related to the same

Re: [Bioc-devel] Git mirror out of sync (LOBSTAHS package)

2017-06-29 Thread Martin Morgan
Should be back on track; again the problem is with multiple commits to svn in a short time. The solution is I think to do 'squash' commits from your git branch to the devel branch, and then to push the one squash commit rather than n individual commits. Martin On 06/28/2017 05:52 PM, James

[Bioc-devel] Git mirror out of sync (LOBSTAHS package)

2017-06-28 Thread James Collins
Hi all — Sorry for the trouble, but the LOBSTAHS Git mirror seems to be out of sync, both on the devel (master) and release-3.5 branches. I pushed a bunch of new commits to devel, and I had to push a few commits to release-3.5 as well to fix a bug identified by a user in the current release