merge with svk

Merge means:

• Merge everything, unless I say I want certain changes

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