svk Upgrading your development from svn to svk and svl #19

Conflict resolution

Traditionally conflicts mean nightmare

continued...
Copyright © 2005 Catalyst IT Ltd.