I think the svn book doesn't treat this functionality thoroughly enough with examples (that being said, our use of svn hasn't been the ideal, so its most likely you won't experience these conflicts in your environment).Ī - local missing, incoming edit upon merge
I've been trying to merge our code into our feature branches and have experienced mysterious conflicts Thought I'd record what I'm doing, maybe it will be useful to someone else out there.
