为什么在Subversion中出现树冲突? [英] Why am I getting tree conflicts in Subversion?

问题描述

我的主干上有一个功能分支，并且正在定期将主干中的更改合并到我的分支中，并且一切正常.今天，我去将分支合并回主干，创建分支后添加到主干的任何文件都标记为树冲突".有没有办法避免将来发生这种情况?

I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the files that were added to my trunk after the creation of my branch were flagged as a "tree conflict". Is there a way to avoid this in the future?

我认为这些标记没有被正确标记.

I don't think these are being properly flagged.

推荐答案

我找到了阅读Gary给出的链接的解决方案(建议这样做).

I found the solution reading the link that Gary gave (and I suggest to follow this way).

总结解决与SVN客户端1.6.x的树冲突提交工作目录，您可以使用:

Summarizing to resolve the tree conflict committing your working directory with SVN client 1.6.x you can use:

svn resolve --accept working -R .

其中.是有冲突的目录.

警告:提交工作目录"意味着您的沙箱结构将是您要提交的结构，因此，例如，如果您从沙箱中删除了一些文件，也从存储库中删除了.这仅适用于冲突的目录.

这样，我们建议SVN解决冲突(--resolve)，从当前目录(.)开始，递归地(-R)接受沙箱(--accept working)内部的工作副本. ).

In this way, we are suggesting SVN to resolve the conflict (--resolve), accepting the working copy inside your sandbox (--accept working), recursively (-R), starting from the current directory (.).

在TortoiseSVN中，右键单击选择已解决"，实际上可以解决此问题.

In TortoiseSVN, selecting "Resolved" on right click, actually resolves this issue.

这篇关于为什么在Subversion中出现树冲突?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！