3 ms·
Even if multiple people change the same file at the same time, it does not necessarily require a manual merge, except when the changes conflict with each other
by tiziano88 14y ago
Even if multiple people change the same file at the same time, it does not necessarily require a manual merge, except when the changes conflict with each other (e.g. add a line at the same position in base and head branches), so the automatic merge does its job most of the times.