远程SVN合并

Question

尝试将分支合并到主干中时

svn merge "$SVN_ROOT/trunk@HEAD" "$SVN_ROOT/branches/foo@HEAD"

我收到以下错误:

svn: '/' is not a working copy

我需要一份工作副本吗？

Answer 1

是的,您需要本地结账.我建议采取以下步骤:

svn co https://foo.bar.com/subversion/project/trunk project
cd project
svn merge https://foo.com/subversion/project/trunk https://foo.com/subversion/project/branches/DEV
svn st

如果有任何冲突,您可以使用以下方法解决它们:

svn resolve

提交更改:

svn commit -m "Merged DEV to trunk."