Question

I’m trying to commit a *.csproj file using Tortoise SVN, but get:

Commit Failed!
…Aborting commit…. .csproj remains in conflict.

OK, so how do I determine what the conflict is so that I can hopefully resolve it?

Answer 1

You could use TortoiseSVN to TortoiseSVN->Check for modifications

Any conflicts will be highlighted here, and can be edited with TortoiseSVN->Edit Conflicts. You could use TortoiseMerge (comes with TortoiseSVN) to resolve your conflicts.

Finally, you can use the command TortoiseSVN->Resolved to remove the temporary riles (e.g. *.mine) that were created by the conflict.

Now you are safe to TortoiseSVN->Commit your changes.