递归解决SVN合并延迟的冲突 [英] Resolving SVN merge postponed conflicts recursively

问题描述

我有一段时间没有接触过的dev分支.自从分支分支出来以来，我将其合并到主干中以集成许多修补程序/更改，但是现在我遇到了许多小冲突(merge-left/merge-right).

I have a dev branch that hasn't been touched for a while. I merged the trunk into it to integrate many fixes/changes in the main line since it was branched out, but now I have many small conflicts (merge-left/merge-right).

我希望使用最新的主干版本来解决每个冲突.我是否可以运行一个命令来自动解决一个工作副本下的所有冲突(在所有冲突中都应使用合并权限)?

I want the latest trunk revision to be used to resolve each conflict. Is there a command I can run that will resolve all conflicts under a working copy in one direction automatically (merge-right should be used for all conflicts)?

如注释中所示，我尝试还原然后使用--accept选项运行svn merge，但显然在SVN 1.0中没有这样的选项.仍在寻找解决方案.

As indicated in the comments, I tried reverting and then running svn merge with the --accept option, only apparently there is no such option in SVN 1.0. Still looking for a solution.

推荐答案

我认为您在发出svn merge命令时可以使用"--accept thems-full"选项. 那应该做你想要的...

I think you can use the "--accept theirs-full" option when you issue the svn merge command. That should do what you want...

这篇关于递归解决SVN合并延迟的冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！