Comment merge? (Score 1) 256
Most version control systems have an automatic merge utility which makes it easy to handle simple concurrent changes, such people independently adding #defines and typedefs in headers. For .c and .cpp files, you should break them up to minimize developer thrashing (I apologize if you've heard that 100 times already).
