从 svn 更新而不自动合并 [英] Update from svn without merging automatically

问题描述

我的同事对 svn update 的工作方式有疑问，但我不确定为什么，所以这个问题有两个方面.首先，如何以他想要的方式解决他的问题，其次，我是否应该尝试说服他，TortoiseSVN 现在做事的方式是最好的方式(如果是的话，怎么做)?

My coworker has a problem with the way that svn update works, but I'm not sure why, so this question has two sides. First, how to solve his problem the way he wants, and second, should I try to convince him that the way TortoiseSVN does things now is the best way (and if so, how)?

他的理想用例

1. 右键单击->SVN 更新
2. 只要文件在工作副本中没有更改，SVN 就会从存储库中提取更改
3. 如果工作副本和 HEAD 都发生了变化，他希望在发生任何事情之前得到提示，并自己进行合并(即使这是 svn 很容易弄清楚的情况).

我想这是一个足够合理的要求，但他不想信任 SVN 的事实困扰着我，尽管它并没有真正影响我或我的工作.他对版本控制并不陌生，以前使用过 CVS、SVN 和 ClearCase.他声称他以前能够在 svn 中做到这一点(而且，他比我大很多年).

I guess it's a reasonable enough request, but the fact that he doesn't want to trust SVN bothers me, although it doesn't really affect me or my work. He's not new to version control, having used CVS, SVN, and ClearCase before. He claims he was able to do this in svn before (also, he is many years my senior).

推荐答案

也许你可以说服他让 svn 进行更改，并让他在签入前检查它们?

Perhaps you can convince him to let svn make the changes, and for him to review them before checking in?

我发现命令 'svn diff --diff-cmd=kdiff3' 对这种情况非常有用.虽然不可否认这是 linux，你的语法会因 TortiseSVN 的不同而有所不同.

I find the command 'svn diff --diff-cmd=kdiff3' useful for exactly this scenario. Though admittedly this is linux and your syntax will vary with TortiseSVN.

这篇关于从 svn 更新而不自动合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！