blocks|key|1988878|text|这可能会有帮助，也可能没有帮助，但有时"svn清理“会修复奇怪的元数据问题。如果您签出一个干净的工作副本，那么干净的副本是否也有同样的问题？如果是这样，那么前面的答案听起来像是朝着正确的方向迈出的一步。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1988879|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

This may or may not help, but sometimes an "svn cleanup" will fix weird metadata issues. If you check out a clean working copy, does the clean copy have the same issue? If so then the previous answer sounds like a step in the right direction

blocks|key|688630|text|~/sandbox/jabira+>+svn+resolve++--accept=theirs-full+testClient/
svn:+warning:+Tree+conflicts+can+only+be+resolved+to+'working'+state;+'testClient'+not+resolved

~/sandbox/jabira++>+svn+resolve++--accept=working+testClient/
Resolved+conflicted+state+of+'testClient'|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|688631|希望这对你有所帮助|unstyled|688632|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|J|8|@]|9|@]|A|$]]|$1|G|3|-4|5|F|7|K|8|@]|9|@]|A|$]]]|H|$]]

<pre><code>~/sandbox/jabira &gt; svn resolve --accept=theirs-full testClient/
svn: warning: Tree conflicts can only be resolved to 'working' state; 'testClient' not resolved

~/sandbox/jabira &gt; svn resolve --accept=working testClient/
Resolved conflicted state of 'testClient'
</code></pre>

Hope this help

blocks|key|1991223|text|您可以使用svn+resolve命令以外的其他方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1991224|1991225|创建冲突文件的修补程序。(或使用svn导出的冲突文件夹版本的备份...)|ordered-list-item|1991226|更新存储库(svn更新)|1991227|应用以前完成的修补程序(或用备份替换冲突的文件/文件夹)|1991228|commit|1991229|+change+(svn+commit)|1991230|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|R|8|@]|9|@]|A|$]]|$1|F|3|G|5|E|7|S|8|@]|9|@]|A|$]]|$1|H|3|I|5|E|7|T|8|@]|9|@]|A|$]]|$1|J|3|K|5|E|7|U|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|V|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|O|$]]

You can use an other way than the svn resolve command:

<ol>
<li>Create a patch of the conflicted file. (or a backup of your version of the conflicted folder with svn export ...)</li>
<li>Update your repository (svn update)</li>
<li>Apply the patch previously done (or replace the conflicted file/folder with the backup)</li>
<li>Commit the change (svn commit)</li>
</ol>

blocks|key|2253028|text|这就是我放弃所有本地更改并使用服务器存储库中的文件的方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2253029|svn+update+--accept+theirs-full

svn+resolve+--accept+theirs-full+<pathname>|code-block|syntax|javascript|2253030|此时将显示以下消息:+W155027:树冲突只能解决为'working‘|2253031|不直观的下一步，但这实际上减少了22条军规|offset|length|style|BOLD|2253032|svn+resolve++--accept=working+<pathname>|2253033|现在递归地恢复所有“有效”的更改。这取消了我所有的本地更改。|2253034|svn+revert+-R+.|2253035|恢复正常，没有错误：|2253036|svn+update|2253037|entityMap^0|0|0|0|0|L|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|11|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|12|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|13|8|@$K|14|L|15|M|N]]|9|@]|A|$]]|$1|O|3|P|5|D|7|16|8|@]|9|@]|A|$E|F]]|$1|Q|3|R|5|6|7|17|8|@]|9|@]|A|$]]|$1|S|3|T|5|D|7|18|8|@]|9|@]|A|$E|F]]|$1|U|3|V|5|6|7|19|8|@]|9|@]|A|$]]|$1|W|3|X|5|D|7|1A|8|@]|9|@]|A|$E|F]]|$1|Y|3|-4|5|6|7|1B|8|@]|9|@]|A|$]]]|Z|$]]

This is what worked for me to abandon all local changes and go with the files from the server repository:

<pre><code>svn update --accept theirs-full

svn resolve --accept theirs-full &lt;pathname&gt;
</code></pre>

This message appears: W155027: Tree conflict can only be resolved to 'working'

Unintuitive next step but this actually cuts the catch-22:

<pre><code>svn resolve --accept=working &lt;pathname&gt;
</code></pre>

NOW revert all the "working" changes recursively. This undid all my local changes.

<pre><code>svn revert -R .
</code></pre>

Back to normal, with no errors:

<pre><code>svn update
</code></pre>

blocks|key|2252957|text|您可能在进行合并时没有更新文件夹，或者在合并之前存在冲突。要修复此问题，您必须将主干(目标文件夹)恢复到以前的版本。然后在该文件夹上运行清理。然后在分支文件夹(源文件夹)上运行cleanup。然后再次更新这两个文件夹。如果您在任何工作流中使用红色的行，那么您需要首先还原这些文件，然后将它们恢复到您想要的状态。然后更新文件夹(是的，再次更新)。最后，再次执行合并。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2252958|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

You probably didn't have your folders updated when you did the merge, or there was a conflict somewhere before the merge. To fix, you'd have to revert your trunk (target folder) to the previous revision. Then run clean-up on that folder. Then run cleanup on the branch folder (source folder). Then update both folders again. If you're getting lines in red in any workflow, then you need to revert those files first, then get them into the state that you want them in. Then update the folders (yes, once again). Finally perform the merge again.

I recently encountered a very weird behavior of subversion. 

I just merged my local copy of a branch with a remote branch. Everything went smooth, but I've got 1 tree conflict (local delete, remote update). 

Okay, thought I, modified the working copy appropriately and ran "svn resolve --accept=working -R .". 

Subversion told that it has resolved my problems and "svn st" no longer showed any issues. So, I tried to commit, but svn told me that one of the inner folders (inside my conflicted one) was out of date and suggested to svn up, BUT it made the folder to be in conflict again!

What shall I do to get out of this visious circle?

Can't resolve tree conflict with SVN

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

教程

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云智能顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

EdgeOne AI 安全实战专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

聚焦“写作效率、视觉美观与运行性能”三方面进行全面升级，为您提供更高效、稳定的创作环境

社区富文本&Markdown编辑器全新改版上线，欢迎大家体验!

诚挚邀请您参与本次调研，分享您的真实使用感受与建议。您的反馈至关重要，感谢您的支持与参与！

社区新版编辑器体验调研

我最近遇到了一种非常奇怪的颠覆行为。我刚刚将分支的本地副本与远程分支合并。一切都很顺利，但我有一个树冲突(本地删除，远程更新)。好的，我想，适当地修改了工作副本并运行"svn resolve --accept=working -R“。Subversion告诉我，它已经解决了我的问题，"svn st“不再显示任何问题。所以，我试图提交，但svn告诉我一个内部文件夹(在我的冲突文件夹中)已过期，并建议

问无法使用SVN解决树冲突
EN

回答 5

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问无法使用SVN解决树冲突EN

回答 5

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问无法使用SVN解决树冲突
EN