SVN 合并 - 完全“他们的全部"- 分支到主干 [英] SVN Merge - Completely "theirs full" - Branch to trunk

问题描述

我想将我的分支合并到主干并且基本上想将分支中的所有代码覆盖到主干..虽然收到冲突，我一直在为所有冲突做他们的全部"；但最后还是显示了很多冲突.

I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the end it shows so many conflicts.

我想要的只是在我的主干上覆盖完整的分支.当然，一种可能的方法是从我的分支中分支出来，但这样我的主干就变得无用了！

All I want is over-write complete branch on my trunk. Surely a possible way is to branch out from my branch but then my trunk becomes useless !

此外，在执行 svn merge 时，我可以提供一个选项，以便对于所有冲突，它都需要一个特定值(在本例中为 Full-theirs )，并且我不必总是为所有冲突输入它.

Also, while doing svn merge can I give an option so that for all conflicts it takes a particular value ( in this case Full-theirs ) and I dont have to type it always for all the conflicts.

推荐答案

将 --accept=theirs-full 传递给 svn merge 命令.

Pass --accept=theirs-full to the svn merge command.

这篇关于SVN 合并 - 完全“他们的全部"- 分支到主干的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！