为什么我会在 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 .

其中 . 是冲突的目录.

where . is the directory in conflict.

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

通过这种方式，我们建议 SVN 解决冲突(--resolve)，接受沙箱中的工作副本(--accept working)，递归(-R)，从当前目录(.)开始.

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屋！