1. Add obj file: add flag --no-ignore
2. delete the .svn
find . -name .svn -type d -print | xargs rm -fr
3. How to rollback to old svn version
svn merge -rHEAD:144 URL/xxx.c xxx.c
4. how to merge develop line to main line
svn merge -r144:HEAD URL(work copy) : merge specific version (or newest version) to current work copy
follow below setups:
i: 使develop 和 main 都更新到最新 --- svn up
ii: 在main line里输入上面的命令, 其中 r144为develop line branch出去的时候的版本号