How to merge branch back to trunk in SVN with all commit history? I know in Git I can use
merge -squash
Is there any equivalent command in SVN?
I'm a bit rusty with merging, but shouldn't that do the trick ?
svn merge -rREV1:REV2 svn://server/branch my_trunk_wc
See:
svn merge --help