Auto-merge control...
From: Robert Conde <Rob.Conde_at_ai-solutions.com>
Date: 2006-08-11 19:10:54 CEST
This might be a subversion issue...but it would be great if there were better control over automerging files. We much prefer to manually merge the files. Our solution thus far has been to put a non-text mime type on all our source files to prevent automerging. Unfortunately this has undesirable side effects such as dis-abling the blame functionality. It would be great if you could just disable auto-merging on a per file extension basis.
Rob Conde
|
This is an archived mail posted to the TortoiseSVN Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.