svk svk - Version Control without the Headaches #16

merge with svk

Merge means:

% svk smerge //project/branch1 //project/branch2

What if there's conflict?

Copyright © 2005 Chia-liang Kao