News for hackers. Stuff that matters.
Re:Version Control Before Git with CVS by ams6110 on Sunday July 08, 2018 @04:24PM (#17486000)
IIRC SVN merges only created conflicts if the same lines were changed. If I edited line 10 and another developer edited line 200 there was no problem. It's been a while, but I also never encountered any serious issues with branching and merging in SVN.

There are no comments on this comment yet.