idea2018.2中使用svn上传，检出，以及冲突解决；

灰太狼 2022-04-22 13:56 258阅读 0赞

***1、开发人员A在 idea中使用 SVN上传代码***

1、启用svn版本控制  
![启用svn版本控制][svn]  
![sdf][]  
2、打开svn仓库  
![打开svn仓库][svn 1]  
3、copy下仓库的url，按照如图操作，当如途中如需填写账号密码就填写就是了；  
![copy下仓库的url，按照如图操作][copy_url]  
4、过滤需要忽略上传的文件  
![过滤需要忽略上传的文件][20181105170011184.png]  
![121][]  
5、分享  
![在这里片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70]  
![惦记上产][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 1]  
5.1默认的版本1.8  
![选择默认][2018110517041548.png]  
5.2分享成功  
![分享成功][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 2]  
5.3已分享颜色变化，受svn版本控制；  
![颜色变化][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 3]  
6、提交commit 提交工程至svn；  
![提交commit][commit]  
6.1选择需要提交的目录，一般提交整个project，主要检查忽略文件；  
![选择需要提交的目录][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 4]  
6.2输入账户名密码，只要有要账户密码的就输入；  
![输入账户名密码][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 5]  
6.3提交完成  
![提交完成][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 6]  
6.4刷新查看提交的工程  
![刷新查询提交的工程][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 7]  
6.5查看svn服务器中提交的工程  
![查看svn服务器中提交的工程][svn 2]  
6.6查看小乌龟中（svn客户端）提交的工程；  
![查看小乌龟中工程][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 8]  
7、编写代码提交;  
![gh][]

7.1提交  
![提交][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 9]  
7.2提交成功  
![提交成功][20181105171428551.png]

--------------------

***检出代码或者工程，解决冲突；***

1、检出工程项目  
![检出][20181105171914781.jpg]  
2、如图  
![如图][20181105172014900.png]  
3、在idea中，为工程创建新的工作空间；找到自己idea安装目录的工作空间建新；  
![创建新的工作空间][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 10]  
4、选择![选择][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 11]

![在这里插入图片描述][20181105172258351.png]  
5、以maven工程检出；  
![dsf][]  
6、同样需要添加忽略文件；  
![或略文件][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 12]

7、开发人员B对工程代码进行修改，提交；  
![开发人员B][B]  
8、开发人员A在没有更新版本的情况下，修改代码提交，会出现冲突，因为A的工程版本相比SVN库中低了一个版本（开发人员B做出了修改，svn库中版本号提升）；  
![提佳绩][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 13]  
9、冲突出现  
![冲突][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 14]  
10、这时候解决冲突，A需要update更新操作;![更新][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 15]  
11、如图操作![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 16]  
12、如图操作  
![在这里插sdf片描述][sdf 1]  
13、更新了  
![更新][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 17]  
14、更新完成提交；![更新s][s]  
15、提交![体积哦啊哦][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 18]  
![提交完成][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 19]

*已解决冲突；*

[svn]: /images/20220422/288c13735ba74847a7d5d12cd3155a07.png
[sdf]: /images/20220422/852da2094cc7409cb6ff4c87c5a0fa27.png
[svn 1]: /images/20220422/6de4d2277a774b34b6678a519341391b.png
[copy_url]: /images/20220422/d35cb8f2da6e49f4abe1edafbcb50e07.png
[20181105170011184.png]: /images/20220422/1ac48893789c40449624030d45798989.png
[121]: /images/20220422/e1a3d00fec474d119cffc99ad3f669be.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70]: /images/20220422/b9e593e58b604d81942f72d588f0fe29.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 1]: /images/20220422/6f0f009061b349a4b47ad6e9c1615360.png
[2018110517041548.png]: /images/20220422/8701099b744c4e709b1ea1048aefa314.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 2]: /images/20220422/37fc630329f94685beafe41aed066379.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 3]: /images/20220422/a50c8f15e2e14192be8f803e3da66182.png
[commit]: /images/20220422/28712d3b527346e59fac54c5a1f644a2.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 4]: /images/20220422/69e24a27b19f4724a549026b20201ddc.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 5]: /images/20220422/30b023abf486403c86c0907cb290236d.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 6]: /images/20220422/7e62f20097454b46927754de9cf8f4cc.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 7]: /images/20220422/65ad2475b753442fba7e05468b538f8f.png
[svn 2]: /images/20220422/f70b9b2ed9194f148d91c26e3a2655cd.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 8]: /images/20220422/fbae9d8eb8fa4e4582863c7535d7110a.png
[gh]: /images/20220422/d6d9a583463744ff808ce72ed13c7697.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 9]: /images/20220422/3abf16dad6584fc597c41bc80cc183b6.png
[20181105171428551.png]: /images/20220422/9eab5b4fa53648089a9139f248cb1a2a.png
[20181105171914781.jpg]: /images/20220422/e0f3895388ec42b996a82956e9e54b52.png
[20181105172014900.png]: /images/20220422/2067730d67b34f1da844a9c1f83c51ae.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 10]: /images/20220422/35a65c2264cb49eca41581ff4a9fbdf2.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 11]: /images/20220422/e8676fa2a7394516b73768b531e9d5fb.png
[20181105172258351.png]: /images/20220422/58ad53a90d0748a1bc61569271b050b4.png
[dsf]: /images/20220422/3da3881c891540478f92ea616fcddc24.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 12]: /images/20220422/932585c9ee4d45b5a70b1c9a1d18922a.png
[B]: /images/20220422/57a79a56acca4cc4b7eb6436a8e84387.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 13]: /images/20220422/9d81fa0b1b9f423ea0f42cdadc3c13e6.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 14]: /images/20220422/c145dce380fa40af832b032161f78c2b.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 15]: /images/20220422/1b615af67cb94dea89e3c1f8b861bae4.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 16]: /images/20220422/b3e432584a9f4a018bc34f59066157e9.png
[sdf 1]: /images/20220422/7c0a4f12c8f44e6bb72d8bb45ae62afd.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 17]: /images/20220422/b705a1954cc9482d9dc95749940d25ab.png
[s]: /images/20220422/b39819a31b66423da0308150ea3d8055.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 18]: /images/20220422/4c44c872449c4a789594be13e4ee3e0c.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjMyMzgwMg_size_16_color_FFFFFF_t_70 19]: /images/20220422/7e6de7dfedb34975a784d306719e3b46.png