RE: Re: Handling binary conflicts

> 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
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.

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