I tried it with 1.14.5 and it works. Is there a way to exclude merge just for a group of file types (e.g not *.py, *.c)?
Best Matthias [email protected] schrieb am Freitag, 7. Juli 2023 um 14:12:54 UTC+2: > It works fine in TortoiseSVN 1.14.5, however the diff-cmd and diff3-cmd > must be separate lines, like this: > > diff-cmd = "C:\\false.bat" > diff3-cmd = "C:\\false.bat" > > I've added some formatting to the English FAQ (it was already there in the > German FAQ, see https://tortoisesvn.net/faq.de.html#noautomerge), it will > be published whenever the web site is updated. > > Kind regards, > Daniel Sahlberg > > > onsdag 5 juli 2023 kl. 11:17:36 UTC+2 skrev [email protected]: > > 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/77b2bfaf-57be-4e45-b02b-a4cccfd24502n%40googlegroups.com.
