活动的创建有助于管理任何可能的合并冲突和解决措施。
This activity is created to help manage any possible merge conflicts and resolutions that may occur.
当你身处痛苦和伤害时，面临冲突和解决问题时，婚姻的美才会向你彰显。
And the beauty of marriage is working through your hurt and pain and resolving your conflicts and solving your problems.
启动程序后点击了两下，我就被要求给自己的小说取名，并用一句话概括主要内容，包括人物、冲突和解决冲突的方案。
Two clicks after launching the program, I'm asked to name my novel and come up with a one-sentence precis that includes a character, conflict and resolution.
这样，她们就可以认识到在每次克服障碍和解决冲突时自己的内心力量的强大之处。
Thus, they attempt to identify the innate strengths that they have used in every situation to overcome obstacles and resolve conflicts.
冲突必须在很大的深度范围内得到检查和解决，尤其是在范例模型方面。
Conflicts must be examined in great depth and are generally resolved in favor of the exemplar models.
AddNode程序着眼于当前安装中定义的端口，并且跨越所有与该安装相关的概要，来发现和解决端口定义中的冲突。
The addNode program looks at ports defined in the current installation, and across all profiles associated with that installation, to discover and resolve conflicts in port definition.
相反，这里的焦点是如何检测和解决因并行更新WebSphereApplicationServer配置而产生的WebSphere Application Server配置冲突。
Rather, the focus here is how to detect and resolve WebSphere Application Server configuration conflicts that can arise from parallel updates of the WebSphere Application Server configuration.
对于每个映射，设置冲突检测和解决方法。
For each mapping, set the conflict detection and resolution.
用户应该理解元类型冲突的原因和解决方案，当您想使用多个定制的元类时，这将非常必要。
Users should understand the cause and the resolution of metatype conflicts. This becomes essential when you want to use more than one custom metaclass.
对于这些情况，业务术语表为企业中每个实体提供一个一致的统一的业务定义和依赖性，从而帮助识别和解决这种冲突。
For these cases, the business glossary helps identify and resolve such conflicts by providing one consistent and common business definition and dependencies for each entity across the enterprise.
我们已了解了如何交付、接受和挂起更改集，以及如何检查和解决冲突。
We have seen how to deliver, accept and suspend change sets, and how to examine and resolve conflicts.
通过其广泛的维和行动，帮助限制和解决了可能会引起威胁到个人安全以及国家稳定冲突争端。
Through its broad range of peace operations, it helps limit and resolve conflicts that could otherwise threaten the security of individuals and the stability of nations.
这些计划包括提供进行展示、与人沟通(特别是外国人士)和解决冲突等方面的指导。
These programs include instruction in giving presentations, communicating with people (particularly foreigners), and resolving conflicts.
冲突管理技巧：能够预防和解决冲突。
Conflict management skills: ability to prevent and solve conflicts.
该组织致力于防止和解决冲突。
文章阐述了商标权利冲突的表现形式和解决商标权利冲突的适用原则。
Paper describes the manifestation of conflict, the trademark right and trademark rights to resolve the applicable principles of conflicts.
环境问题产生的原因在于环境利益与传统利益的冲突，而预防和解决环境问题是环境法的主要任务。
Environmental issues resulted from the conflict between environmental advantage and traditional advantage, to prevent and resolve environmental issues is the main task of environmental statute.
而培养防止和解决成员间冲突的能力仍将是联盟的首要问题。
And the ability to deter and resolve conflicts among its members must remain one of its priorities.
其中，间接途径通过角色扮演和解决冲突来实现影响。
And, the indirect way realizes his influences through the roleplay and settling the conflict.
互联网名称与地址分配机构称撰写尾缀、审核应用和解决任何冲突的准则花了数千万美元。
ICANN says it costs tens of millions of dollars to write the guidelines for suffixes, review applications and resolve any disputes.
她认为启迪和对话是改变观点和解决冲突的最佳途径。
She favours enlightenment and dialogue as the best path to changing attitudes and resolving conflict.
所有冲突都在中心(全局)副本中记录和解决。
All conflicts are recorded and resolved at the hub (global) replica.
指出在基于策略的分布式系统管理中，策略冲突的检测和解决直接影响到管理措施的正确执行以及管理的效率。
The detections and solutions of policy conflict are vital for correct enforcement of management and their actions efficiency in policy-based distributed system management.
简要介绍了TRIZ冲突解决原理的基本概念、原理和解题思路。
The basic concepts, principles and resolving idea of TRIZ conflict resolving theories were briefly introduced.
本文主要对这一问题进行了讨论，并提出了实时数据库结构优化和解决实时数据访问冲突的解决办法。
This issues are mainly discussed in this article, then the structural optimization of the real-time database and the measure to resolve the access collision in the real-time database are put forward.
您可以检测和解决任意详细等级的冲突。
You can detect and resolve conflicts at any level of detail.
您可以检测和解决任意详细等级的冲突。
You can detect and resolve conflicts at any level of detail.
应用推荐