Friday, June 19, 2009

SVN fail most sighted

The svn fail I see most is like this:


<<<< working
# some line
====
>>>>> other


Now, how is it a conflict that I added a line of code and trunk didn't? I will freely admit that the diffing stuff is very smart and not very easy. I want to cut a lot of slack, and I'm happy that this is easy to resolve, but I really have to wonder how that is not an update rather than a conflict.