SVN Merge

Create branch
right click the project -> svn -> branch tag.  
Fill in the URL. you can specify a new folder on the url, svn will create that folder for you automatically.
you can swich working copy to new branch or not.


Merge
After you finish developing the branch, you need merge branch back to trunk (branch).

 

Steps:
Merge trunk (SVN server) to your branch(working copy).

right click branch (working copy) -> merge, select merge type (Merge a range of revisions)(first radio button). -> Fill the URL to merge from textbox (server trunk URL).-> next -> working copy -> merge.


After that, commit your branch(working copy) to branch (SVN server).


Switch to your trunk (working copy), merge the new version branch (SVN server) to your trunk (working copy).

 

right click trunk (working copy), ->merge, select merge type (reintegrate a branch)(second radio button).-> Fill the From URL textbox (server branch URL) -> next -> working copy ->merge.

 

commit your trunk(working copy) to trunk (SVN server)

  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值