You can use the Compare editor to resolve conflicts.
您可以使用Compare编辑器来解决这些冲突。
Rule: Resolve conflicts on the branch that is least stable.
规则：在最不稳定的分支上解决冲突。
It's best to resolve conflicts before you hit the sack.
最佳的方法是在睡前解决掉所有争端。
He went into retreat and tried to resolve the conflicts within himself.
他去静修并试图调节自己内心的矛盾冲突。
However, the Internet has been known to leverage technology in order to resolve these conflicts.
然而，互联网已经知道利用技术，以解决这些冲突。
Because, what we try to do is to resolve specific conflicts.
因为，我们试图做的是解决具体的冲突。
Resolve source control conflicts.
解决源代码管理冲突。
Game theory can be an appropriate approach to simulate and resolve such conflicts.
博弈论是解决这类冲突的一种有效方法。
Do you want to run the conflict Viewer to view and resolve the conflicts?
是否要运行“冲突浏览器”以查看并解决冲突？
Do you want to run the conflict Viewer to view and resolve the conflicts?
是否要运行“冲突浏览器”以查看并解决冲突？
应用推荐