问题
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:
回答1:
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.
回答2:
Try opening the file directly in notepad or your text editor (after choosing resolve later perhaps?). See if there are >>>>, <<<<, ==== conflict markers (these are standard in SVN for denoting conflicts), and resolve the conflict manually if so.
来源：https://stackoverflow.com/questions/5440721/tortoise-svn-conflict-occurs-but-no-edit-conflict-button-is-shown