I'm using BC with P4V and have it configured for 3 way merge to resolve merge conflicts.
Is there a way to get BC to auto-resolve all changes except the actual conflicts? It seems like I have to step through each change and accept if it, even if its not an actual conflict.
Cheers!
Is there a way to get BC to auto-resolve all changes except the actual conflicts? It seems like I have to step through each change and accept if it, even if its not an actual conflict.
Cheers!
Comment