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

Re: [TSVN] Re: Re: TortoiseMerge: Editing conflicts

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2004-09-26 00:59:25 CEST

> Another pertinent question might be: why do you get
> conflicts half the time? This normally only happens when
> 2 developers are working on the same section of code at
> the same time.

I cannot say definitively that Subversion has this problem, but I do a lot
of J2EE development. A common task all of the developers have to do is add
new values to the end of a resource bundle/properties file, as well as make
edits to the same general section of an XML configuration file. Because
the edits are to the same area of the file, they typically show as
conflicts. In this case, a proper merge is to insert both sets of edits
into the file. Actually, I wonder if TMerge would even allow me to do
that? We have been working on other projects since moving to Subversion,
but when we were on CVS and doing a lot of J2EE, this came up all of the
time and was a pain.


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Sep 26 11:10:21 2004

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