Hi, is there a solution available? I am facing the same problem. Greetings Matthias [email protected] schrieb am Montag, 4. März 2019 um 19:53:57 UTC+1:
> Hello, > > we use TortoiseSVN 1.11.1 (updated to this version after a long time) and > it seems that the hack to disable automerge doesn't work anymore (see here > https://www.codeproject.com/Tips/157286/Prevent-Subversion-from-doing-automatic-merges > > or in the FAQ). > > diff-cmd and diff3-cmd is set to the batchfile which contains the two > lines of code but it seems that this has no effect anymore. > > Any idea how to prevent automerge and show files as conflict due updating? > > Greetings > > Stefan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/0c324ace-ad5c-471b-801a-dd7cc24580een%40googlegroups.com.
