I’m studying the Subversion Version Control System and ran across this humorous quote in Chapter 3:
Merging conflicts by hand can be quite intimidating the first time you attempt it, but with a little practice, it can become as easy as falling off a bike.
You would think they actually meant “as easy as riding a bike”, but no … I think they really did mean falling. Merging conflicts in files is tradionally the bane of all version control systems. I’ve seen developers throw their hands up in the air, give up, and run to the bar for a good beer when resolving conflicts in Clearcase & CVS.
We’ll see if SVN is any better at handling conflicts.