Menu
I saw this line from the free svn online book:
"To resolve property conflicts, simply ensure that the conflicting properties contain the values that they should, and then use the svn resolved command to alert Subversion that you have manually resolved the problem."
I had a conflict in my repo with the svn:ignore property. I fixed the conflicts as was said in the .prej file generated by the conflict
How do I tell SVN that the conflict with the property is now resolved?
575
Look for conflicted files in the Current Folder browser. Check the SVN status column for files with a red warning symbol , which indicates a conflict. Right-click the conflicted file and select Source Control > View Conflicts to compare versions.
You have to given the resolved command.
svn resolved .
"." for the current directory.
64
Found it. I examined the contents of dir_conflicts.prej which will give me an idea of the conflict. I then fixed it as specified in the file and I deleted dir_conflicts.prej and the conflict was already resolved.
32
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
