prevent Subversion from doing automatic merges?
Some people don’t like the fact that Subversion merges changes from others with their own local working copy changes automatically on update. Here’s how to force those files into a conflicted state so you can merge manually at your convenience. • In TortoiseSVN->Settings->Subversion configuration file, click on the edit button. • Change the [helpers] section by adding diff-cmd = “C:\\false.bat” diff3-cmd = “C:\\false.bat” (note the double backslash) • Create the file C:\false.bat which contains two lines @type %9 @exit 1 This effectively makes auto-merge fail every time, forcing the file into conflict. The reason for the curious ‘type %9’ line is that the diff3-cmd sends the merged output to stdout. Subversion then takes this and overwrites your local file with the merge results. Adding this line avoids getting an empty local file.
