svn 冲突解决

 

svn: E155015: Aborting commit: '$path + $file' remains in conflict

 

解决步骤

 

1、svn resolved 'file'

执行后结果

Resolved conflicted state of 'pom.xml'

2、svn ci -m'conflict' pom.xml

执行后结果

Deleting pom.xml
Committing transaction...
Committed revision XXX

　　3、svn add pom.xml

执行后结果

Adding pom.xml
Transmitting file data .done
Committing transaction...
Committed revision