1) I got some conflicts when updating one of my working copies. I struggled to resolve the conflict but failed miserably, then I decided to just remove the .svn folder and re-checkout from the repository. After that the color of the working copy folder disappeared (i.e, no green check marks at all), although I can still do svn update, svn commit, etc. I'm on Windows 7 Home.
2) I still have conflicts on another working copy. The warning message is as follows:
Trying to change property 'svn:ignore' but the property has already been locally changed to a different value. Local property value: file1 file2 file3 file4
Incoming property value: file1 file3 file4 file5
How should I resolve this conflict?
3) If I decide to re-checkout, what is the proper procedure to do that?
Thank you very much for your help!
If you don't have any changes in your working copy that you need to save or if your changes are minimal, then your best bet is to:
1) Rename the directory that your existing working copy is in (i.e. WC Old)
2) Create a new folder with the same name as the one you just renamed
3) Right-click on the new folder and select SVN Checkout...
Follow the steps from here that you used to check out the source initially.
If you have a lot of changes in your working copy and you know the folder that the issue is occurring in, you can:
1) Right click on the folder and select Tortoise SVN and then Revert...
2) VERY CAREFULLY, ensure that ONLY the folder icon (this is the location that the ignore values are stored) is checked.
3) Click Ok.
This will revert just the changes on the folder itself, which is where the ignore values are stored.
If you are incredibly brave, you could also display the properties for the folder in windows explorer, click the subversion tab, click the properties button, and edit or remove the properties as appropriate.