On Wed, 13 Jun 2012 13:56:01 +0000, rlloyd wrote:

> We are developing an IDM solution and using svn (svn+ssh access) to
> access a shared repository. All is great until we get into a conflict
> situation. Designer pops up a message box tells us we need to resolve
> conflicts. On clicking OK I expect to see the "local copy", "server
> copy" dialog, but this never appears on any machine.

Just curious, but if you 'svn stat' the project directory, what does SVN
think the conflict is?

David Gersic dgersic_@_niu.edu
Knowledge Partner http://forums.novell.com

Please post questions in the forums. No support provided via email.