Thanks for the reply, Tom. That's what I thought. Unfortunately,
that's not the behavior I'm seeing. If I use an external merge
application (DiffMerge) it works (I can edit the center file) as
expected but the built-in Conflict Solver won't allow me to edit
anything. I've verified that the file is editable so am quite
confused. I'd prefer to use the built-in Conflict Solver if at all
possible, so any help would be appreciated.
I'm running a MacBook Pro with OS X 10.4.11, if that's any help.
Kevin N. Emslie Sarsen
kevinsarsen@...
On Jun 25, 2009, at 2:19 AM, syntevo Support wrote:
>
>
> 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@...
>
[Non-text portions of this message have been removed]
------------------------------------
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/
