OK, how about this then:

        - The "master" branch we are currently using remains the
          primary development branch.  Anything that introduces a
          new feature is committed to this branch.

        - We create a new branch, tentatively named "stable", and
          initially branched away from where "master" is now.
          Anything that fixes a bug is committed to this branch.

        - Periodically, as necessary, we merge the stable branch
          into the master branch, so that the master branch also
          receives bug fixes.

Comments?
-- 
Ben Pfaff 
http://benpfaff.org


_______________________________________________
pspp-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/pspp-dev

Reply via email to