merging with svk
- "svk push" and "svk pull" are actually merges.
% svk pull /depot/path % svk pull # often enough if in working copy
- Also "svk smerge" to apply changes from one place to another, like "svn merge"
% svk smerge //project/branch1 //project/branch2
- However it is merge history aware