SVN Source control issues when merging changes

Posted by HollyStyles on Stack Overflow See other posts from Stack Overflow or by HollyStyles
Published on 2010-02-12T14:22:28Z Indexed on 2010/04/02 3:13 UTC
Read the original article Hit count: 334

Filed under:
|
|

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?

© Stack Overflow or respective owner

Related posts about version-control

Related posts about svn