Is your setup of SVN integrating everything, or does the Co-coder accidentally erase your work?

I think a too fast conflict resolving between r22 and r24 made something wrong in the code but we couldn’t find what. We made a proper rollback and re-solved the conflict. That solved the problem but took 6 revisions at least…