conflict handling. It seems to support my impression that it is buggy and can't do things that even Subversion handles well. Is this correct?