Re: [TSVN] problem with tortoiseMerge after svn merge tag1 tag2

Lorenz Lenhardt wrote:

[snip]
> I then try to "Edit Conflicts", but although there are definitely
> conflicts in the merged <file>, none of them is shown as conflicting in
> TortoiseMerge. Therefore I'm not able to resolve the conflicts using
> TortoiseMerge, but have do do so by hand using my text editor.
>
> Am I doing something wrong here?
> I couldn't find anything about this topic in the documentation nor the
> mailing list.

I have no idea why TortoiseMerge wouldn't show you a conflict in such a
situation. Can you send those four files to the list or me directly so I
can check what's wrong? Or are the files closed source?

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Aug 16 18:34:41 2004