【svn's tree conflict】
A tree conflict occurs when a developer moved/renamed/deleted a file or folder, which another developer either also has moved/renamed/deleted or just modified.
1、Local delete, incoming edit upon update
2、Local edit, incoming delete upon update
3、Local delete, incoming delete upon update
4、Local missing, incoming edit upon merge
5、Local edit, incoming delete upon merge
6、Local delete, incoming delete upon merge
参考：http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html