我怎样才能先发制人地推迟svn合并冲突？
[英]How can I preemptively postpone svn merge conflicts?
问题描述
I often encounter conflicts when doing a Subversion merge, for example: 
我在进行Subversion合并时经常遇到冲突，例如：
svn merge -r10347:HEAD ^/branches/header-and-navbar
I know about --dry-run , and I do that to get a preview. 我知道--dry-run ，我这样做是为了预览。
But then after running it for real, if I want to choose "postpone" for each conflict, that can take a long time for a lot of files. 但是在真正运行它之后，如果我想为每个冲突选择“推迟”，那么对于很多文件来说可能需要很长时间。
How can I tell Subversion ahead of time not to ask me for each file? 如何提前告诉Subversion不要问我每个文件？
1 个解决方案
解决方案1
16 已采纳 2012-07-12 22:00:48
svn merge -h lists all the options, and the one you're looking for is svn merge -h列出了所有选项，你要找的是
svn merge --accept postpone
or 要么
svn merge --accept p
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.