[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: Dave Eccleston <deccles_at_mitre.org>
Date: 2004-09-27 05:54:28 CEST

Simon Large wrote:
"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.

I said "the need to edit" comes up half the time.  I was making a point about picking theirs, yours, vs. editing when a conflict happens, and the frequency in which editing is the appropriate resolution.

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."
You should resist the urge to get preachy and quote stuff at people.  It's irritating, and you were wrong about what I meant anyway.

--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org For additional commands, e-mail: dev-help@tortoisesvn.tigris.org Received on Mon Sep 27 08:45:40 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.