svk svk - Version Control without the Headaches #17

Conflict resolution

Conflicts were nightmare

>>> YOUR VERSION
....
=== ORIGINAL VERSION x
....
=== THEIR VERSION x
....
<<< THEIR VERSION y
continued...
Copyright © 2005 Chia-liang Kao