Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Nicholson, Eric wrote: > Does anyone know of a good way to automatically keep the current binary file > if a merge will produce a conflict, rather than performing the default > "copy" operation? I looked at the cvswrappers doc, but copy" or "merge" > don't quite do what I want. Maybe you can somehow place the files you don't want to merge on a different branch? Gerhard