CSE Roadmap

Core tier · about 3 hours · 7 parts

Part 4 of 7 · 1 min read

Merges

Two teams, one file.

CA names a second symptom. When many people edit the same class for different reasons, their changes land in the same file. Say finance and HR each ask a developer for a change in the same week. Two developers edit Employee, and version control reports a conflict when they combine their work.

A merge conflict costs time. Worse, a careless merge can mix the two changes, and the tests of one team can fail because of the other team's edit. The more actors a class serves, the more often this happens.

The fix in both cases is the same: pull the code of each actor into its own class, so that a request from one group touches one file.

Check yourself: 1. Why do conflicts appear more often in a class with many actors? 2. What is the common fix for accidental duplication and for merge conflicts?