3

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 !

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.

4

2 回答 2

7

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

于 2014-01-22T07:18:01.403 回答
2

如果你想：

  • 合并分支到主干
  • 对于任何冲突，请使用分支中的完整文件
  • 自动执行

你必须

  • 拥有 /trunk 的干净工作副本
  • 将您的分支合并到 WC 的根目录中：svn merge ^/branches/BRANCH
  • 使用accept选项以始终更喜欢分支的文件：添加--accept 'tf'到合并并获得最终形式svn merge ^/branches/BRANCH --accept 'tf'
于 2014-01-22T07:22:15.450 回答