Versions Compared

Key

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

...

What makes it "ready to merge"

  1. Ensure that any relevant database upgrade scripts are in place prior to the merge (and appropriate to the current master branch's version number)
  2. Add unit tests to new classes and methods.  These should be true unit tests, which mock any external system dependencies (i.e.: no database should be required).
  3. Add automated integration tests (using Marvin!) or unit-style tests that may require external systems to exist, so that primary test scenarios are modeled and automated.
  4. A RAT report shows that there are no license header issues outstanding.
  5. Any new dependencies have been discussed and agreed on in the dev list.
  6. Legal docs updated in the branch to support any new dependencies.
  7. The branch has been rebased against the latest version of master, so that the differences are limited to what's expected to merge (grab the master commit-sh, so that you can point to it in the merge email).
  8. Test the build, run unit tests, run integration tests.  Everything should be passing before moving forward with a merge proposal.

...