这是怎么回事？我使用过 TFS 和 SourceGear Vault，这些源代码管理器都不会像 SVN 那样损坏文件。他们实际上打开了一个漂亮的小窗口，让您有机会解决冲突，然后将解决的代码应用到您的文件。 SVN 的方法似乎是在代码文件中散布“标记”，当您意识到代码由于设计时错误而无法构建或由于格式错误的标记而无法加载页面时，您必须手动删除这些“标记”。最烦人的是项目文件的 XML 被损坏，导致您必须卸载项目并手动编辑 XML。
有人可以告诉我有一种方法可以告诉 SVN 不要这样做，这样它的行为就像一个理性的源代码管理器吗？
What's going on here? I have used TFS and SourceGear Vault and neither of these source code managers corrupt files like SVN. They actually open up a nice little window giving you the chance to resolve conflicts and then apply the resolved code to your file. SVN's approach appears to be to litter your code files with "markings" that you have to manually delete after you realize your code doesn't build due to design-time errors or pages don't load because of malformed markup. The most annoying is when the project file's XML gets corrupted, causing you to have to unload the project and edit the XML manually.
Can someone please tell me that there is a way to tell SVN not to do this so that it behaves like a rational source code manager?
发布评论
评论（3）
使用合并工具或使用像 TortoiseSVN 这样的 GUI 客户端，它将为您完成这项工作，您将获得类似或更好的 SVN 和解决冲突的体验。
Use a merge tool or use GUI client like TortoiseSVN which will do the job for you and you will have a similar or better experience with SVN and resolving conflicts.
你们有冲突。不用担心，有多种方法可以解决它：
这里有一个关于如何从命令行解决它的方便教程（ Windows + Mac)
这是一个可以轻松解决冲突的 Mac subversion 客户端列表< /a>
在 Windows 上，几乎我认识的每个人都使用 TortoiseSVN
此外，询问参与该项目的其他人也是一个很好的形式。就如何明智地解决冲突达成一致。祝你好运！
You have a conflict. Not to worry, there's a number of ways to resolve it:
Here's a handy tutorial on how to solve it from the command line (Windows + Mac)
This is a list of Mac subversion clients that should resolve conflicts easily
On windows, pretty much everyone I know uses TortoiseSVN
Also, it's just good form to ask the other people working on the project who committed last and agree on how to resolve the conflicts intelligently. Good Luck!
我强烈建议使用 TortoiseSVN 并将其配置为使用 GUI 差异/合并工具。
来源
I strongly recommend using TortoiseSVN and configuring it to use a GUI diff/merge tool.
Source