解决乌龟冲突
我最近问了一个有关提交新文件的问题，但现在我无法解决冲突。
左侧
来源 SOURCE RIGHT
你想如何解决...
让我选择将更改合并到新文件中或标记为已解决 - 两者都不起作用。当我标记为已解决时，我得到一个大红色 x，当我合并时，它仍然不允许我覆盖冲突文件上的文件
I recently asked a question about committing a new file but now I am having trouble resolving a conflict.
Says
SOURCE LEFT
SOURCE RIGHT
how do you want to resolve...
gives me choices to merge changes into a new file or mark as resolved- neither really works. when i mark as resolved i get a big red x and when i merge its still not letting me overwrite as the file over the conflicted file
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
假设您已经解决了冲突并保存，那么您应该能够使用命令“TortoiseSVN -> Resolved”将文件标记为已解决。然后，这应该允许您将更改提交到存储库。
有关 TortoiseSVN 合并的更多信息，请访问此处
Assuming that you have resolved the conflicts and saved then you should be able to use the command "TortoiseSVN -> Resolved" to mark the file as resolved. This should then allow you to commit your changes to the repository.
More information about TortoiseSVN merges can be found here