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

RE: Re: Handling binary conflicts

From: Sven Kirchner <Sven.Kirchner_at_innomea.com>
Date: 2006-05-30 14:17:35 CEST

> From: Andy Levy [mailto:andy.levy@gmail.com]
> Sent: Dienstag, 30. Mai 2006 14:11
> To: users@tortoisesvn.tigris.org
> Subject: Re: Handling binary conflicts
> 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
> > progress box and choose "resolve using mine" or "resolve using
> > should work.
> I did the actual merge at the command line, so I don't have a merge
> progress box.

Open the "Check for Modifications" dialog. Select the conflicting file
and choose either "resolve using mine" or "resolve using theirs".

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:17:45 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.