请问有没有一种方法可以告诉SVN不要这样做,以便它像合理的源代码管理器一样运行?
请问有没有一种方法可以告诉SVN不要这样做,以便它像合理的源代码管理器一样运行?
使用合并工具或者像TortoiseSVN这样的GUI客户端,它们会为你完成这项工作,并且使用SVN解决冲突会让你获得更好的体验。
你遇到了冲突。不要担心,有多种方法可以解决:
这里有一个方便的教程,教你如何从命令行(Windows + Mac)解决它
在Windows上,几乎所有我认识的人都使用TortoiseSVN
此外,向项目中其他参与者询问最后一次提交的人,并就如何智能地解决冲突达成一致意见很重要。祝好运!
我强烈建议使用TortoiseSVN,并配置它使用GUI差异/合并工具。
It doesn't take too much setting up to use with TortoiseSVN. Open the Settings dialog from the TortoiseSVN Settings menu. In the External Programs section select Diff Viewer and select the External radio and supply the command line argument:
path\DiffMerge.exe /t1=Mine /t2=Original %mine %base
Make sure you supply a valid path to the installed DiffMerge product! When displaying changes this will display your version changes in the left panel with base in the right.
To get the three panel merge select the Merge Tool in the External Programs section, and as before select the External radio and supply the following command line argument:
path\DiffMerge.exe /t1=Mine /t2=Base /t3=Theirs /r=%merged %mine %base %theirs
This will display three columns with your version, followed by the base version followed by the repository version - allowing you to merge changes from both sides into the centre at your leisure...