>Subversion 1.6 recognizes a new kind of conflict, known as a "tree conflict". Such conflicts manifest at the level of directory structure, rather than file con

>Subversion 1.6 recognizes a new kind of conflict, known as a "tree conflict". Such conflicts manifest at the level of directory structure, rather than file content. >Situations now flagged as conflicts include deletions of locally modified files, and incoming edits to locally deleted files. Files and directories which are victims of a tree conflict cannot be committed before the conflict is marked resolved. Wow - finally! This is great. We've had to handle these edge cases during merges (greatly slowing our scripts) for a long time. Hopefully this will give us significant speed improvements which should help with one of the minor irritants of our users.