译文来源于百度翻译
conflicts have been resolved in the file 冲突已在文件中得到解决conflicts have been resolved in the
阅读背景：
svn 冲突解决 Decide how to resolve conflict on xxxx.java
来源：互联网
分享到：
