乌龟SVN发生冲突，但未显示编辑冲突按钮

本文介绍了乌龟SVN发生冲突，但未显示编辑冲突按钮的处理方法，对大家解决问题具有一定的参考价值，需要的朋友们下面随着小编来一起学习吧！ 问题描述

合并.js文件时发生冲突-Tortoise SVN表示发生了冲突，但未显示任何编辑冲突按钮.这是什么意思?如果没有编辑冲突按钮，该如何解决?

I have a conflict when merging a .js file - Tortoise SVN says a conflict occured but no edit conflict button is shown. What does this mean, and how do I fix it if there is no edit conflict button?

缺少编辑冲突按钮的屏幕截图:

Screenshot of missing edit conflict button:

推荐答案

如果禁用了编辑"按钮，则表示该文件不是文本文件(即具有非文本svn:mime-type属性)放).在这些情况下，您不能在期间编辑冲突，但是必须在 完成后手动解决冲突.

If the edit button is disabled, that means that the file in question is not a text file (i.e., has a non-text svn:mime-type property set). In those situations you can not edit the conflict during a merge but you have to resolve the conflict manually after the merge is done.

如果属性(而不是文件内容)存在冲突，则同样适用.

The same applies if there's a conflict in properties, not content of a file.