SVN Source control issues when merging changes
- by HollyStyles
I have seen where changes have been made on one code file by two developers code like this:
x++
End up like this:
x++
x++
where due to carriage returns being inserted/removed (I think) one line has become silently merged as two lines of the same code (no conflicts) Everything compiles but suddenly tests are failing and weird behaviour ensues.
Should this be possible? How do I guard against it?