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

RE: Tortoise: How Are Conflicts Defined?

From: Fisher, John <jfisher_at_forthrightsolutions.com>
Date: Wed, 20 Aug 2008 16:00:19 -0500

I don't believe you can have "conflicts" without using three files - The
original, the file changed by you, and the file changed by someone else.
If you have modified the same line in a different way than the other
user, you have a conflict.

 

John

 

From: Glenn Mehling [mailto:glenn.mehling_at_taxtools.com]
Sent: Wednesday, August 20, 2008 3:32 PM
To: users_at_tortoisesvn.tigris.org
Subject: Tortoise: How Are Conflicts Defined?

 

Hello Everyone. I have a couple of questions about Tortoise. How are
conflicts between two versions determined? Can this
"conflict-identification" methodology be re-configured? For the
following, would any of these be considered conflicts?

* file A, line 12: a... file B, line 12 a...
* file A, line 12: a... file B, line 12 b...
* file A, line 12: aa... file B, line 12 ab...
* file A, line 12: aa... file B, line 12 aa..
* file A, line 12: aaa... file B, line 12 aab...
* file A, <Assembly: AssemblyVersion("1.1.2.2")> ... file B,
<Assembly: AssemblyVersion("1.1.2.3")> ...
* file A, Data Source=CFSDB1;Initial Catalog=DBDev;Integrated
Security=True... file B, Data Source=CFSDB2;Initial
Catalog=DBDevelopment;Integrated Security=True...

I've researched this topic online, but have not been able to find
anything helpful.

Thanks. Glenn
Received on 2008-08-21 03:58:20 CEST

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