dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

Here's a suggestion for how to handle merges with personal
maintainer branches:

A. If personal branch is green and changes are "uncontroversial" (bug
fixes, improvements, etc):

  1. create merge request on Launchpad
  2. merge

B. If personal branch is green and one can suspect the merge may lead
to discussions (new features, new designs, etc):

  1. create merge request on Launchpad
  2. wait for a while (1/2 - 1 day?)
  3. merge if there are no objections


Step (1) is good since it signals that a merge is about to
happen. Other maintainers should then look at the proposed changes and
object before the branch is merged.

Another thing I've been considering is if perhaps it would be a good
idea to make Johannes responsible for keeping the main branch green.
The strategy would be very simple:

  while True:

    if green:
      idle
    elsif red:
      revert latest merge

Would that work?

--
Anders