[Subclipse-users] Prevent silent merges

We just had a disaster. Two people were working on the same file, making
changes, and when they updated/committed, subversion did a silent merge
of the changes. The cause a major bug which took an large amount of time
to find and fix.

This is obviously unacceptable. I haven't the words to express what a
spectacularly bad design decision it was to enable silent merges.

The correct way to handle it (and yes, I use the word "correct"
deliberately) is to force a developer to review any conflicts manually.

How can I shut down this silent merge behavior?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-02-09 01:36:18 CET