On 8/20/2014 5:51 AM, plplot-devel-requ...@lists.sourceforge.net wrote: > Date: Tue, 19 Aug 2014 12:24:54 -0700 (PDT) > From: "Alan W. Irwin" <ir...@beluga.phys.uvic.ca>
.. > In sum, I think rebase-only is not only back on the table for our > initial workflow model due to Brad's recommendation of it for that > purpose but also likely the final choice (enforced by server-side > update hook logic at push time as recommended by Brad). I'm also ok with rebase only, at least to start. I think it should work well enough as the project is not super active so we should not have too many problems with "racing to commit". I agree with Phil that this will mean that there is only a master branch. One project that has taken this approach is SBCL: http://www.sbcl.org/ Thoughtfully they provide the hook that they use to enforce rebase only on their master branch: http://sourceforge.net/p/sbcl/sbcl-git-hooks/ci/master/tree/update -Hazen ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel