撤消“解决”无需恢复和重新合并
我正在做合并。合并后，我提交所有文件而不会发生冲突。然后我解析单个文件并提交它们。如果我犯了错误，如何重做解析（即使我还没有提交解析的文件）？
与预期相反，我无法恢复该文件。合并后恢复到任何步骤时，任何文件都不会再次发生冲突。这意味着我有一次机会正确解决，或者必须将 wc 恢复到合并之前的某个点并重新尝试合并 - 这需要很长时间。
似乎在进行合并时，合并行为将作为工作副本根文件夹的属性应用，然后 wc 被视为已合并，无论是否存在未解决的冲突。存储库中是否没有任何冲突被标记为这样？
删除文件并执行 svn update 没有成功，因为我检索该文件，就好像它没有合并一样，并且尝试再次合并没有找到任何变更集。
I'm doing a merge. After merging I commit all files without conflicts. Then I resolve single files and commit them. If I make a mistake how do I redo the resolving (even if I haven't committed the resolved file yet)?
Contrary to expectation I cannot revert the file. When reverting back to any step after the merge none of the files become conflicted again. This means I have one chance to resolve correctly or having to revert the wc to a point before the merge and reattempt the merge - which takes a long time.
It seems when doing a merge the act of merging is applied as a property on the working copy root folder, and then the wc is considered merged, whether or not there are conflicts outstanding. Is it right that none of the conflicts are marked as such in the repository?
Deleting the file and doing an svn update did not succeed as I retrieve the file as if it wasn't merged and attempting to merge again does not find any changesets.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
revert 做了它应该做的事情——将文件恢复到您没有进行任何编辑的版本。因此不会有任何冲突，因为您修改的任何内容都会被还原。解析应该使用您和“他们的”版本创建临时文件，diff 可以在该文件上工作。您应该获取您的版本并删除另一个版本，以便您可以更新并再次尝试解决。如果你的svn没有创建这些临时文件，备份文件来解决就是你需要做的！
revert does what it should do -- revert the file to the version without any edits from you. Therefore there aren't any conflicts, because anything you modified is reverted. Resolving should create temporary files with your and "their" version, on which diff works. You should take your version and remove the other one, so you can update and try to resolve again. Backing up the file to resolve is what you need to do if your svn does not create these temporary files!