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

Re: Conflicts

From: Milen A. Radev <milen_at_radev.net>
Date: Fri, 3 Oct 2008 23:08:18 +0300

2008/10/3 Eric Lemes <ericlemes_at_gmail.com>:
> Hi there,
> I have a question about conflict resolution in TortoiseSVN. I'm currently
> using TSVN 1.5.3. within a 1.4.2 server.
> When I do an update and a conflict files appear, I first edit the conflicts
> (with Araxis Merge) and left the ".mine" file in the correct state. Then I
> click in "Resolved".

What's "the correct state"? And why ".mine"?


Milen A. Radev
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-03 22:08:29 CEST

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.