Extreme Programming Installed

Slow Merges

Occasional conflicting edits are a natural result of going rapidly with collective ownership. In the beginning of your project they will be more common; if you only have one class, everyone is going to be making changes to it. As your system grows, conflicting edits should become fewer and fewer. If this is not the case, the best way to solve this problem is to release your changes more frequently. This will reduce the likelihood that two pairs will conflict. See Continuous Integration

Some teams try to avoid simultaneously editing anything. Please don't do this—moving where the code leads is more important than the occasional collision of conflicting edits. Instead, edit what needs it, and deal with collisions as they happen.

In ...