在svn指令行merge之後檔案經常會出現local add, incoming add upon merge問題，導緻無法送出，可以通過以下指令解決沖突 Summarizing to resolve the tree conflict committing your working dir with svn client 1.6.x you can use:
where . is the directory in conflict.
在svn指令行merge之後檔案經常會出現local add, incoming add upon merge問題，導緻無法送出，可以通過以下指令解決沖突 Summarizing to resolve the tree conflict committing your working dir with svn client 1.6.x you can use:
where . is the directory in conflict.
![Android-opencv之CVCamera[圖]](data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs=)