How to merge branch back to trunk in SVN with all commit history?

后端 未结 5 562
长情又很酷
长情又很酷 2021-01-30 17:32

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?

5条回答
  •  时光说笑
    2021-01-30 18:12

    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
    

提交回复
热议问题