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

[TSVN] Re: Re: TortoiseMerge: Editing conflicts

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-25 11:51:58 CEST

"Dave Eccleston" wrote

> The need to edit conflicts comes up about half the time.

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. If this is happening regularly then maybe you need
to reorganise your work or your communications. If you are generating
conflicts all the time you will surely come to grief, whether you have
super-merge-editor or not.

This is not just flame: the quote below comes from the SVN book (chapter 2:
copy-modify-merge), also reproduced in the TSVN help file & manual.

"In the end, it all comes down to one critical factor: user communication.
When users communicate poorly, both syntactic and semantic conflicts
increase. No system can force users to communicate perfectly, and no system
can detect
semantic conflicts."

Simon

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

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