svn 冲突解决 Decide how to resolve conflict on xxxx.java
2017-04-06 09:32
465 查看
译文来源于百度翻译
conflicts have been resolved in the file 冲突已在文件中得到解决
resolve the conflict by using my version of the file 通过使用我的文件版本来解决冲突
resolve conflicts in local file with my changes 用我的更改解决本地文件中的冲突
resolve the conflict by using the incoming version of the file 通过使用文件的传入版本来解决冲突
resolve conflicts in local file with changes from incoming file 解决本地文件中的冲突与传入文件的变化
resolve the conflict by using the base version of the file 使用文件的基本版本解决冲突
conflicts have been resolved in the file 冲突已在文件中得到解决
resolve the conflict by using my version of the file 通过使用我的文件版本来解决冲突
resolve conflicts in local file with my changes 用我的更改解决本地文件中的冲突
resolve the conflict by using the incoming version of the file 通过使用文件的传入版本来解决冲突
resolve conflicts in local file with changes from incoming file 解决本地文件中的冲突与传入文件的变化
resolve the conflict by using the base version of the file 使用文件的基本版本解决冲突
相关文章推荐
- (XCode多人开发问题)SVN: How to resolve a conflict tutorial
- 解决android上java.net.UnknownHostException: Unable to resolve host "xxxx": No address associated wit
- 使用git cherry-pick 解决冲突,commit changes to other branch and resolve conflict
- 解决android上java.net.UnknownHostException: Unable to resolve host "xxxx"
- (XCode多人开发问题)SVN: How to resolve a conflict tutorial
- SVN: How to resolve a conflict tutorial
- svn: how to resolve “local edit, incoming delete upon update” message
- How to install sun-java5-jdk on Ubuntu 10.04
- How to RESOLVE a breakpoint on a managed Main method.
- How to run a Java Program as a daemon (service) on Linux (openSUSE) using a shell script
- svn: how to resolve “local edit, incoming delete upon update” message
- Tips on how to decide on a great luxurious enjoy
- svnsync failed to get lock on destination repos 问题解决
- How to resolve java.lang.ClassNotFoundException in Java
- Access restriction: The type XXXX is not accessible due to restriction on required library的解决办法
- how to install subversion(svn) with eclipse on windows
- How to install Sun Java 1.5 on Ubuntu 10.04
- 如何解决flash跑到层上面的问题?How to resolve the div layer appear over the top of flash?
- How to resolve conflicts in TortoiseSVN
- How to Install Sun Java on Debian