menu for: Resolving conflict - names appropriate to other windows

[Michał L.]

I initially submitted a report on WinMerge github poject, as I was thinking it was about this program.
https://github.com/WinMerge/winmerge/issues/3260#issuecomment-4074101285

Now I know to direct my question here.

I sse the option to change this:

C:\Program Files\WinMerge\WinMergeU.exe /e /ub /fr /wl /wm /dl %bname /dm %tname /dr %yname  %base %theirs %mine /o %merged /ar

So I did simple test with:

C:\Program Files\WinMerge\WinMergeU.exe /e /ub /fr /wl /wm /dl %bname111 /dm %tname222 /dr %yname333  %base %theirs %mine /o %merged /ar

My question is:

what proper name should be used in place of 111 222 333 ?

I mean which one corresponds to:

• Resolved
• Resolve conflict using theirs
• Resolve conflict using mine

and how this menu names can be changed by adding corresponding descriptions like following:

• Wokring Base
• Remote file
• Working copy

Thank you in advance for your answer and understanding in forgiving my poor knowledge of English.

Michał

[Michał L.]

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 ?

[Stefan]

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 michal.lip...@gmail.com 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

[Michał L.]

wtorek, 17 marca 2026 o 17:12:54 UTC+1 Stefan napisał(a):

maybe check the docs:

https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html

Thanks I take a look asap

wtorek, 17 marca 2026 o 17:12:54 UTC+1 Stefan napisał(a):

however in the link to the winmerge forum you mention TortoiseGit, not TortoiseSVN? Maybe you're still asking at the wrong place?

TortoiseGit was mention by sdottaka here:
https://github.com/WinMerge/winmerge/issues/3260#issuecomment-4074101285

I corrected the name to TortoiseSVN here:
https://github.com/WinMerge/winmerge/issues/3260#issuecomment-4074576608

wtorek, 17 marca 2026 o 17:12:54 UTC+1 Stefan napisał(a):

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

thanks for explanation

To be exactly sure I would ask:
when you wrote:

wtorek, 17 marca 2026 o 17:12:54 UTC+1 Stefan napisał(a):

working base: the version you updated from the server, but without your local modifications

did you mean that:

working base: the version you updated last time from the server, but without your local modifications already made by yourself

[Michał L.]

btw.
of course "mine" are:

your local version together with your local modifications already made by yourself