Conflict resolution

Traditionally conflicts mean nightmare

>>> YOUR VERSION
....
=== ORIGINAL VERSION x
....
=== THEIR VERSION x
....
<<< THEIR VERSION y

Even with just whitespace change!

The svk way:

Conflict found on file boo:
(d)iff, (t)heirs, (y)ours, (m)erge, (e)dit, (s)kip ? 

(Stolen from Perforce)