1、第一步,先把分支项目用TortoiseSvn下载到本地任意一个目录下。
[img]http://dl2.iteye.com/upload/attachment/0117/0358/4eefa0af-6c0d-38c8-88af-f3e45b640579.png[/img]
2、选中分支项目,右键点击merge,如下图
[img]http://dl2.iteye.com/upload/attachment/0117/0360/991446e4-3f4e-32f4-a96f-f019ee1082b5.jpg[/img]
3、点击next,如下图
[img]http://dl2.iteye.com/upload/attachment/0117/0362/d5cc8547-c7ec-30c5-96bb-5e8a8a15b950.png[/img]
4、选择主干的SVN地址,如下图,然后点击next
[img]http://dl2.iteye.com/upload/attachment/0117/0370/9e3a08cb-08dc-3220-a4a1-037b2cc332f6.jpg[/img]
5、点击merge,如下图
[img]http://dl2.iteye.com/upload/attachment/0117/0372/f43d6a0a-5e1a-3002-bcec-2a4a2580551a.png[/img]
6、merge之后,如下图:
[img]http://dl2.iteye.com/upload/attachment/0117/0374/ded15de7-fbad-3278-b0fd-cf20edc76cd7.jpg[/img]
updated:更新的:added:新增的;
conflictt:冲突的
大家根据这些不同情况解决了冲突,就可以提交了。就跟在eclipse里单个项目的SVN用法类似。
[img]http://dl2.iteye.com/upload/attachment/0117/0358/4eefa0af-6c0d-38c8-88af-f3e45b640579.png[/img]
2、选中分支项目,右键点击merge,如下图
[img]http://dl2.iteye.com/upload/attachment/0117/0360/991446e4-3f4e-32f4-a96f-f019ee1082b5.jpg[/img]
3、点击next,如下图
[img]http://dl2.iteye.com/upload/attachment/0117/0362/d5cc8547-c7ec-30c5-96bb-5e8a8a15b950.png[/img]
4、选择主干的SVN地址,如下图,然后点击next
[img]http://dl2.iteye.com/upload/attachment/0117/0370/9e3a08cb-08dc-3220-a4a1-037b2cc332f6.jpg[/img]
5、点击merge,如下图
[img]http://dl2.iteye.com/upload/attachment/0117/0372/f43d6a0a-5e1a-3002-bcec-2a4a2580551a.png[/img]
6、merge之后,如下图:
[img]http://dl2.iteye.com/upload/attachment/0117/0374/ded15de7-fbad-3278-b0fd-cf20edc76cd7.jpg[/img]
updated:更新的:added:新增的;
conflictt:冲突的
大家根据这些不同情况解决了冲突,就可以提交了。就跟在eclipse里单个项目的SVN用法类似。