解决方法:清空svn的队列
1.下载sqlite3.exe (附件)
2.找到你项目的.svn文件,查看是否存在wc.db
3.将sqlite3.exe放到.svn的同级目录
4.在cmd命令窗里执行:
sqlite3 .svn/wc.db "select * from work_queue"
sqlite3 .svn/wc.db "delete from work_queue"
sqlite3 .svn/wc.db "select * from work_queue"
1.下载sqlite3.exe (附件)
2.找到你项目的.svn文件,查看是否存在wc.db
3.将sqlite3.exe放到.svn的同级目录
4.在cmd命令窗里执行:
sqlite3 .svn/wc.db "select * from work_queue"
sqlite3 .svn/wc.db "delete from work_queue"
sqlite3 .svn/wc.db "select * from work_queue"
解决冲突:
team->show tree conflicts->resolve->选择-》finish