Given that a merge, or lack thereof, can break code and waste a lot of
time and resources, it's better to require explicit confirmation that a
merge is resolved, instead of relying on implicit confirmation.
Requiring 'svn resolved' on any and all merge conflicts is very simple
to understand and train folks on, as opposed to instructions and
processes that have exceptions or special cases.
Plus, any shortcut that saves a couple seconds of typing, but has the
downside of potentially causing dozens of wasted man-hours of work to
recover from (testers (or the customer) find the problem, dev has to
hunt the problem down, and the fix initiates another round of
build-deploy-test which requires more time and resources,) isn't a
From: Andre Wisplinghoff [mailto:firstname.lastname@example.org]
Sent: Sunday, September 24, 2006 8:34 AM
Subject: Solving conflict by removing file
I just wondered that I had to do a 'svn resolved $file' although
i deleted the file by doing a 'svn del $file' just before.
Shouldn't it be possible to solve a conflict just by deleting
the corresponding file?
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA623
Received on Mon Sep 25 18:23:40 2006