[TSVN] Resolving Conflicts

I'm sorry for what will probably seem to you guys like
a stupid question.

But I CANNOT figure out how to merge to conflicting
versions!

I am used to using CVS. The TortoiseSVN documentation
says "You can either launch an external merge tool /
conflict editor with the Edit Conflict context menu".
I cannot find any "Edit Conflict" context menu
anywhere.

To finish my changes, the documentation says
"Afterwards execute the command Resolved from the
context menu and commit your modifications to the
repository." Again, I cannot find a context menu with
"Resolve" on it anywhere.

I've tried doing a "diff" on the file from the
TortoiseSVN context menu (the only "context menu" I
can find). I use WinMerge to do the diff, but when I
try to save I just get an error message saying "...is
marked read-only. Would you like to ssave the file
under a different name?")

You guys are obviously using it just fine - what am I
missing? Where is this hidden context menu that the
docs refer to?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jul 23 23:41:34 2004