[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Handling binary conflicts

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-05-30 14:11:26 CEST

On 5/26/06, Donald H Locker <donald.locker@ptmelec.com> wrote:
> Right-click on the conflict line for the binary file in question in the
> progress box and choose "resolve using mine" or "resolve using theirs"
> should work.

I did the actual merge at the command line, so I don't have a merge
progress box.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue May 30 14:11:39 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.