That's great, sorry I should have mentioned binary files but Marcus covered
it. It hadn't occurred to me to copy and paste the file, but that's a good
interim solution, and I can manually rename the binary files as I have done
previously. And then I can beat my staff around the head to keep the
branches properly synced with the trunk so it's not always me that has the
horror merge case to fix things. 
C
On Mon, Mar 17, 2008 at 7:55 PM, SyntEvo Support <
smartsvn-support%40syntevo.com">smartsvn-support
syntevo.com> wrote:
> Hello Chris, Marcus,
>
>
> > A very nice solution exists in TortoiseSVN: you can solve a conflict
> > by choosing "take left file" oder "take right file". This works for
> > text files an binaries of course.
>
> This will be implemented for SmartSVN 4 as well.
>
> --
> Best regards,
> Marc Strapetz
> _____________
> SyntEvo GmbH
>; www.syntevo.com
>
> "Marcus T. Jaschen" < rikman%40gmail.com">rikmangmail.com <rikman%40gmail.com>> wrote:
>
> > On Mon, Mar 17, 2008 at 4:51 PM, SyntEvo Support
> > < smartsvn-support%40syntevo.com">smartsvn-supportsyntevo.com <smartsvn-support%40syntevo.com>>; wrote:
> >
>; > > You want to take the complete right file? Just copy the whole right
> content
> > > and paste it in the center view.
> >
>; > Hi,
> >
>; > this will work for text files only. If there are conflicts with
>; > binaries (images for example) the conflict solver shows a notification
> > dialog and quits.
> >
>; > A very nice solution exists in TortoiseSVN: you can solve a conflict
> > by choosing "take left file" oder "take right file". This works for
> > text files an binaries of course.
> >
>; > Best regards, Marcus T. Jaschen
> >
>; > ------------------------------------
> >
>; > Yahoo! Groups Links
> >
>; >
>; >
>; >
>;
>
>
[Non-text portions of this message have been removed]
.
