不要化解冲突。
What effect do your conflicts have on your kids, and have you found other ways to help your children through them?
你们的矛盾对孩子有什么影响，你有没有找出别的办法帮助孩子渡过这样的时刻？
And the beauty of marriage is working through your hurt and pain and resolving your conflicts and solving your problems.
当你身处痛苦和伤害时，面临冲突和解决问题时，婚姻的美才会向你彰显。
Once you have conflicts, it is also your decision when and how you want to resolve them.
一旦您遇到了冲突，也是由您决定什么时候以及如何解决它们。
As you change your current flow target, the potential conflicts may also change.
当您变更了您当前的流目标，潜在的冲突也可能变更。
Without honesty, your best efforts to resolve conflicts will be wasted because you will not understand each other well enough to find mutually acceptable solutions.
没有诚实，就不能很充分很好地了解彼此以找到互相都能接受的解决方法也解决冲突的最大努力也将白费。
Once you decide to accept the changes that have highlighted potential conflicts, your repository workspace will contain conflicts that have to be resolved.
一旦您决定接受标记出潜在冲突的变更，您的存储库工作区中就将包含必须解决的冲突。
For example, if one of your features is “writes well”, a benefit might be “helps minimize conflicts due to miscommunication”.
例如，如果你的特质是“文笔好”，那好处可能就是“有助于使因沟通有误而产生的矛盾最小化”。
You can have code merging from the integration stream to your development stream, which involves moving labels and resolving merge conflicts.
你可以从集成流集成代码到开发流，这包括移动标签并解决合并冲突。
Each table provides slightly different information, so be aware of whether you are using live or historical data to avoid introducing conflicts or inconsistencies into your reports.
每一个表格都提供了稍微不同的信息，所以您要意识到您使用到的是活性数据还是历史性数据，以避免引入冲突或者报告的不稳定性。
You merge the proposed changes on top of your work to resolve the conflicts.
您在自己的工作之上合并建议的变更以解决冲突。
You will show respect to your loved ones and learn to handle conflicts better if you just watch what you are saying.
如果你注意自己所说的话，你将对自己所爱的人表现出尊重，并学会更好地处理矛盾。
While this is potentially a bit awkward, it ensures you won't have naming conflicts with other databases on your system if you're following along (and hopefully you are).
虽然可能有点罗嗦，但如果按照本文实验(希望如此)的话这样可以避免与系统中其他数据库的命名冲突。
You can undo your changes that are causing conflicts.
您可以取消引起冲突的变更。
Depending on the logic of your agent, running the same agent on multiple servers may cause replication conflicts.
根据代理逻辑，在多个服务器上运行同一代理可能导致复制冲突。
If your package won't conflict with any other packages, then you need not include the "Conflicts" information, and so on.
如果您的软件包不与任何其它软件包冲突，那么您就不需要包含“Conflicts”信息，等等。
Packages that conflict with your package outright should be listed in the "Conflicts" fields.
与您的软件包完全冲突的软件包应该列入“Conflicts”字段。
The "Conflicts" and "Replaces" fields specify packages that are not dependencies, but rather packages that don't belong on the system at the same time as your package.
“Conflicts”和“Replaces”字段指定非相关的软件包，而不是不与您的软件包同时属于同一系统的软件包。
As with dramatic films, there needs to be interesting characters, conflicts and plots. Unlike dramatic films, these should occur naturally, without directing the people in your documentary.
透彻的研究你的纪录片主题。在开始拍摄以前，你得知道你到底要拍一个什么样的故事。就像故事片一样，纪录片中一样要有有趣的人物，冲突和故事情节。和故事片不同的是，所有这些都是自然而然的发生的，而不是在你的导演之下。
When changes are made to files in the repository by a different developer, the SCM can identify conflicts from your changes and either automatically merge them or notify you of the conflict.
其他开发人员更改了存储库中的这些文件后，SCM会标识出这些变更与您所做的变更之间存在的冲突，然后自动将其合并或通知您存在冲突。
A good practice to avoid name conflicts is to define your own name space before starting to work on the project.
避免名字冲突的一个比较好的操作方式，是在开始处理项目之前定义自己的名字空间。
Traditional software programs can produce conflicts with other programs on your hard drive.
传统的软件可能会在你的硬件设别上与其他软件产生冲突。
Assure your employer that any scheduling conflicts will be worked out among the staff and have a component of your plan that explains step by step how this will happen.
向你的上司保证，员工中任何的时间冲突都可以解决，并且在你的计划中注明这点是如何一步一步实现的。
You can either remove the change or change set from your repository workspace, or, as we'll see in the next section, you can accept and resolve the created conflicts.
您要么从存储库工作区中去掉变更或变更集，要么如下一个部分中见到的，您可以接受或解决所生成的冲突。
You can now instruct your calendar to accept a meeting even if it conflicts with an earlier meeting.
现在可以指示日历接受会议，即使该会议与前面的会议冲突。
Empathy is the basis for experiencing others' feelings, desires and conflicts, and moving beyond your tendency to view the world only through your own lens.
同情是体会他人的感受、渴望和矛盾的基础，超越只透过自己的角度看世界的倾向。
Resolve conflicts with others. – Always forgive people and move on even if they never ask for your forgiveness.
总是原谅别人并往前看，即便他们从未请求过你的原谅。
This approach can only be done if this is the first time you are encountering conflicts with your changes.
此方法只能在您第一次遇到关于您的变更时使用。
This approach can only be done if this is the first time you are encountering conflicts with your changes.
此方法只能在您第一次遇到关于您的变更时使用。
应用推荐