SVN Tree Conflict Errors
- by John
I seem to see such errors quite often in our SVN 1.6 repo. We got these quite a lot while we used to just work on /trunk so I don't think it's due to merge/branching confusion. It seems that a cleup and marking the conflict resolved always works, but it's a little concerning to see errors in your version control system when you're just adding/updating/deleting files.
What causes it?