Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

IF your feature is isolated in a single subroutine and you are not changing datatypes, you can probably use long-lived branches.

If your feature is not speculative – it will definitely be in ACME – but will take a long time, you should develop directly in master.

Direct development in master (recommended)

  1. Split the long-term development in to logical pieces that can be checked in to master as they are finished.
  2. Add pieces back to master with PRs as is done for mainline ACME development.
  3. Add a test or tests for your new feature.  These tests won't be added to the main acme test suites until the feature is "officially added".  If you have more then one, they could be part of a separate test suite.  Your PR must still pass the standard ACME testing.
  4. Develop the next piece of your feature with a new branch from the head of master.

...