|
|
|
|
|
|
by kstenerud
5185 days ago
|
|
|
Give p4merge a try. We have a huge codebase, and I've found that p4merge, though not perfect, tends to do better than the default. Another thing we've done to keep the insanity down is break our monolithic project into a few library projects to keep the project file merge damage to a minimum. |
|
|