When merging files in Tortoise, why do I sometimes get 2 working copies of files

Question

I recently merged in Subversion, while most of my conflicts are of type ...

MyFile.java
MyFile.java.working
MyFile.java.merge-left.rXXXXX
MyFile.java.merge-right.rYYYYY

I can easily resolve conflicts. However, some of my conflicts are of type ...

MyFile.java
MyFile.java.working
MyFile.java.merge-left.rXXXXX
MyFile.java.merge-left.rYYYYY
MyFile.java.merge-right.rYYYYY
MyFile.java.merge-right.rZZZZZ
MyFile.java.2.working

The solution tool seems to choke on this and even when I manually make changes and select a solution. It still leaves an extra working copy, and I can no longer edit conflicts. I'm relatively new to Subversion, but I was asked to help with a larger migration. Any tips?

Answer 1

TortoiseSVN . - " " - , . , , , .

, , , . , , , .

Answer 2

subversion , , ( ). , Tortoise , ( , , , svn).