SVN conflict
Let’s say you and your colleague are editing a document at the same time. Then the other person saves and commits and there’s a conflict.
Now there are three files in SVN:
OriginalFile.doc
OriginalFile.doc.r20501
OriginalFile.doc.r20502
The last one contains the changes the other person made and committed. What you should do in this situation is:
1. Backup your own copy
2. Revert the file in SVN
3. Update the file in SVN
4. Then you could put locks on for future situations like this
This is done with Tortoise SVN as follows:
a) Select the file
b) Choose ‘Tortoise SVN’
c) ‘Properties’
d) Then click ‘New’ and select ‘svn:needs-lock’
e) Then input “*” without the quotes into the ‘Property Value’ field and press ‘Ok’
5. After the locks make your changes (you have to check them from your backup)
6. Save and commit
