svn系列之十二常见问题——代码冲突解决方法2

复杂代码冲突的处理方法
1)不更新冲突代码，不让冲突文件产生
[img]http://dl2.iteye.com/upload/attachment/0111/6154/0bae38f1-5c0e-3e45-9344-9756a5b30bcd.png[/img]
[img]http://dl2.iteye.com/upload/attachment/0111/6156/88b0836f-957f-32bc-a700-3afd70aa53f7.png[/img]

2)备份一份会冲突代码文件(重要)
[img]http://dl2.iteye.com/upload/attachment/0111/6158/15443a22-94a8-3257-8a43-9f8471da0fe5.png[/img]
[img]http://dl2.iteye.com/upload/attachment/0111/6160/638c4eb9-845d-3429-b4da-a84c81c55843.png[/img]

3)将代码恢复到上一个版本(右击文件，选中ToroiseSVN菜单的Revert选项)
[img]http://dl2.iteye.com/upload/attachment/0111/6162/cf8e5517-2cf5-3291-8eff-e1226989f360.png[/img]

4)然后更新svn仓库最新的代码(右击空白处，选中svn update选项)
[img]http://dl2.iteye.com/upload/attachment/0111/6175/c6656341-5348-37cf-b9db-b5e79d468668.png[/img]
[img]http://dl2.iteye.com/upload/attachment/0111/6179/8b8b23f9-15fb-3902-ae4a-3a5dc4812c70.png[/img]

5)将备份的文件重命名，粘贴到与被备份文件相同文件夹中
[img]http://dl2.iteye.com/upload/attachment/0111/6191/a4fc8f50-5652-306d-9825-1015a3878def.png[/img]

6)选中这两个文件，使用svn的比对工具，进行代码比对
[img]http://dl2.iteye.com/upload/attachment/0111/6164/e44996eb-b50f-311b-bfea-d816aa56f6c0.png[/img]

7)也可以与操作记录中的文件进行比对
[img]http://dl2.iteye.com/upload/attachment/0111/6168/dfa65b05-af9f-3267-a3f9-cd57f430748f.png[/img]
[img]http://dl2.iteye.com/upload/attachment/0111/6170/99ea0ca5-839b-324c-87bf-2868aaf09a20.png[/img]
[img]http://dl2.iteye.com/upload/attachment/0111/6172/057b5dfd-db6d-3985-aeb1-fb96d88ce296.png[/img]


8)代码相冲突的开发人员相互沟通怎么修改冲突代码，修改完之后就提交代码
[img]http://dl2.iteye.com/upload/attachment/0111/6166/93de2984-80b8-35a0-8703-032e07479be4.png[/img]

9)最后记得同步代码(重要)