1.svn ci -m "update"
svn: Commit failed (details follow):
svn: Aborting commit: 'test.log' remains in conflict
2.使ç¨svn resolved test.log
3.svn ci -m "update"
è¿ä¸ªæ¶ååºè¯¥å¯ä»¥æ交äº
4.svn rm test.log
å é¤æè¿ä¸ªæ件
5.svn ci -m "update"
å次æ交
è¿ä¸ªæ¶åæå¡å¨ä¸å°±æ²¡æè¿ä¸ªæ件äºã
å¨å
¶ä»çæå¡å¨ç»ç«¯ä¸å¦æéå°è¿ä¸ªé®é¢çæ¶åéå¤è¿ä¸ªæä½ã
温馨提示:答案为网友推荐,仅供参考