merging with svk, example (4/4)

Developer B finishes work on branch

Developer A decides to merge in changes

cd project
svk sync //mirrors/project
svk smerge //mirrors/project/branches/foo //mirrors/project/trunk
Auto-merging (0, 9) /mirrors/project/branches/foo to /mirrors/project/trunk (base /mirrors/project/trunk/:5).
Waiting for editor...
Merging back to mirror source svn://svnhost/project.
U   TODO
U   bin/svm
New merge ticket: 4c3eae4b-bd02-0410-9c35-832880404089:/mirrors/project/branches/foo:8
New merge ticket: d493f855-bd02-0410-a5ec-d0716c0397f6:/local/project-foo:9
Merge back committed as revision 9.
Syncing svn://svnhost/project
Retrieving log information from 9 to 9
Committed revision 10 from revision 9.

No conflicts, so nothing else required! No double checking that merged changes were really made on the branch, so no HEAD changes inadvertently backed out.

continued...