Will Gayther wrote:
> 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.
That menu entry is only available if you right-click on a file which has
the Subversion status "conflicted".
> 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.
Again, this menu entry is too only available for "conflicted" files.
> 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?")
Why do you use WinMerge? You could use TortoiseMerge - for resolving
conflicts it's definitely the better choice! WinMerge can't do three-way
diffs which are required for resolving conflicts.
> You guys are obviously using it just fine - what am I
> missing? Where is this hidden context menu that the
> docs refer to?
It seems to me that your file isn't conflicted after all. What makes you
think it has a conflict? Or is the file not "text"?
If your file is not "text" then you have to resolve the conflict
manually: then there are, apart from your original file two additional
files with ".rXXX" extensions, where the "XXX" indicates the revision
numbers where they're from. With binary files usually you have to choose
which one you want to keep. Then right-click on the conflicted file
(over which you copied over the one you want to keep, or which you
edited with the associated program) and choose "resolve".
Stefan
---------------------------------------------------------------------
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:51:34 2004