Versions Compared

Key

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

...

Testing and Merging: When the feature branch is done, the developer performs relevant testing within the feature branch, issues a "pull request", and designates an Integrator.  The Integrator conducts the code review, performs any additional testing and merges the branch to master.   The integrator and developer merges the feature branch into the "next" integration branch and tests the feature within the latest version of ACME.  The integrator and developer may need to work together to resolve any issues that arise from the code review or testing in the "next" branch.  The integrator will then  merge the branch into master.  Once merged to master, the branch is complete and the developer can move on to other topics.

...