Versions Compared


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



(DJC here)  A better approach going forward would be to merge master into productionsproduction, and switch the test system to the production branch.  This probably ought to be done right before building RC1.  The dev team would have 2 options then:

  1. Checkout branches based on what they are working on (i.e. checkout production for bug fixes for the release, and their current clone of master – every one is cloning for new work, right? – for ongoing work)
  2. Alternatively, make bug fixes in master and cherry-pick merge changes into production as bugs are fixed

The former is the better approach, IMO, because it ensures that the bug fix is made on the current code base for the release.