.bak extension

I use TortoiseSVN and AnkhSVN with subversion and Winmerge. We have to manually merge our code with that of another team, which I do outside of VS. We typically merge their changes into our code and Winmerge by default saves our original version with a bak extension - file.rhtml.bak or file.html.erb.bak. When I open the project in VS, synchronize/ankhSVN find theses backup files, adds them to the project and marks them for addition to the repository. When I run the project, I usually find that things don't run as expected - I'm not seeing the changes or other errors because the layouts and controllers no longer match. If I delete the backup copies then everything is OK.

I haven't done this for a while so it's difficult to get more specific. Obviously, it's redundant to have Winmerge create backups, so it's easy to stay clear of the problem.

The other problem I still see on an ongoing basis and that I posted on before is that Synchronize will refuse to find and add things to the project. I have usually seen this when I add a plugin - it doesn't matter if I generate the plugin within the project environment or manually add the folder outside of the project. No matter how many times I try, Synchronize will not add the folder and files to the project. I can edit the project file, adding all the folders and then add all the individual files to the folders within VS, after which everything is OK.