After both sides have calmed down, they can use another key strategy for conflict resolution.

在双方都冷静下来之后，他们可以使用另一个解决冲突的关键策略。

Workflow and conflict resolution strategy

工作流和冲突解决战略

Listing 4. jQuery conflict resolution.

清单4 . jQuery解决冲突的办法。

How are your conflict resolution skills?

你解决冲突的本领如何？

Conflict Resolution in a Multi-Master environment.

多主机环境中的冲突解决方案。