svk svk - Version Control without the Headaches #17

Conflict resolution

Conflicts were nightmare

continued...
Copyright © 2005 Chia-liang Kao