Parallel tracks need a merge strategy
Conflicts are not only textual. Two tracks can make compatible edits that disagree on behavior, ownership, configuration, or tests. Decide how to integrate before parallel work starts.
The safest default is one integrator who reviews each track and resolves conflicts against the task contract.
| Conflict | Response |
|---|---|
| Same lines | Resolve manually with the task contract |
| Same behavior | Choose one design and record the decision |
| Shared configuration | Sequence changes or assign one owner |
| Different tests | Compare assumptions before merging |
| Unclear ownership | Pause and return to the owner |
Merge review sequence
- Collect branch names and changed-file lists.
- Compare each diff with the original scope.
- Identify overlapping paths and behavior.
- Integrate the smallest compatible slice.
- Run focused checks and then the broader gate.
- Record unresolved risk before merge.
Conflict record
# Track integration
Tracks: <names>
Overlap: <paths>
Decision: <which behavior wins>
Checks: <commands>
Residual risk: <list>
Merge decision: GO / HOLD
Status: documented example.Canonical lesson source · JavaRush
Open JavaRush material