2 ms·
That's true. But if both developers are developing out of the same branch, and are checking in small patches at a time, they are more likely to notice the inte
by btilly 17y ago
That's true. But if both developers are developing out of the same branch, and are checking in small patches at a time, they are more likely to notice the interaction as it is happening and actually talk to each other.
The more difficult problems come when each worked on it for 2 weeks, then they discover a month or two later that there is a conflict - after both have forgotten what they were doing and why they were doing it.