maybe check the docs: https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html
however in the link to the winmerge forum you mention TortoiseGit, not TortoiseSVN? Maybe you're still asking at the wrong place? On Tuesday, March 17, 2026 at 2:10:51 PM UTC+1 [email protected] wrote: also what a differences are between: Working base <> Remote file is "Working base" a latest version that I have updated reclently from server to my local copy/storage ? and "Remote file" is a current version on the server ? working base: the version you updated from the server, but without your local modifications remote file (i.e, "theirs") is the latest file on the server 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 visit https://groups.google.com/d/msgid/tortoisesvn/342f762b-cfd5-49c9-a996-eec06dbd9063n%40googlegroups.com.
