Hi Kevin,
In the (built-in) Conflict Solver you should (by default) see three files
right beside each other. At least the center file content should be editable
if the file on your disk is editable.
--
Best regards,
Thomas Singer
=============
syntevo GmbH
http://www.syntevo.com"Kevin N. Emslie Sarsen" <
kevinsarsen@...> wrote:
> I just started evaluating SmartSVN, primarily for its merge feature.
> Unfortunately, the Conflict Solver doesn't allow me to resolve any of
> the conflicts. The files display but there's no way to edit
> anything. Can someone tell me what I'm missing?
>
> Kevin N. Emslie Sarsen
>
kevinsarsen@...
------------------------------------
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/smartsvn/<*> Your email settings:
Individual Email | Traditional
<*> To change settings online go to:
http://groups.yahoo.com/group/smartsvn/join (Yahoo! ID required)
<*> To change settings via email:
mailto:
smartsvn-digest@...
mailto:
smartsvn-fullfeatured@...
<*> To unsubscribe from this group, send an email to:
smartsvn-unsubscribe@...
<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/
