6.3Integrating from the main game

Bring the main game's newer work into an edition. Files the edition owns are parked for a person to decide.

Section 3 of 4 in this chapter

Integration walks the commits the main game has made since the last integration and applies everything the edition does not own. It can run on a schedule or on demand.

For most files this is silent and boring, which is the goal: a bug fix in a shared system lands in the main game and turns up in the demo and both console editions without anyone doing anything.

Divergences

The interesting case is when the main game changes a file the edition owns — you overrode the Switch texture settings, and now someone has changed the base ones.

  main commits since last integration
        │
        ├── file the edition does NOT own ──► applied
        │
        └── file the edition OWNS ──────────► parked for review
                                                  │
                                        stays until a person
                                        answers it — it does not
                                        expire with this run

Figure 6-2. Integration applies what it can and leaves a standing question behind for what it can't.

The pending list is a standing query, not a report from one integration run. It does not scroll away, and tomorrow's integration does not clear it. Reviewing a divergence means deciding whether the edition takes the main game's new version or keeps its own, and both are one action.

Was this helpful?