Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Add pointer to developing with externals

...

Focus on your branch:  While working on their branch, developers should focus on the work necessary to complete the branch and not worry about what else is going on.  In particular, there is almost never a need in git to "merge from master" or "stay current" with development going on in master or other branches to make the eventual merge easier.   If a developer thinks a merge from master or another branch is necessary to complete their work, they should check with an Integrator first.

Developing with externals:  some code in ACME has its primary development in another repo.  Be aware of which code is an external and follow Developing with Externals if necessary.

"master" is always stable:  Our code development workflow ensure that master is always stable and can be used to start new development.

...