We've taken a tour of possible integration approaches. Other schemes can certainly work, but our final scheme provided these benefits:
People don't silently step on each other's work.
Integration is transactional; new changes are either fully included or fully excluded.
The system moves from a known-good state to a known-good state.
The approach is compatible with source control.