Conflicts occur when you accept changes into a repository workspace.
当您将变更接受到存储库工作区中时会发生冲突。
Accept changes when they arrive instead of fighting the reality.
接受变故,而不要跟现实对抗。
Always positive, willing to accept changes and take criticism well.
总是积极向上,乐意接受各种变化和批评意见。
However, this is not good if the client really wants to automatically accept changes.
但是如果客户机确实希望自动接受变化,这就不太好了。
Similarly, no change is required to accept changes to those values from other component views.
同样,从其他组件视图接受这些值的更改时,不需要进行任何更改。
Among the latter, some will have evidently to be let go; others will have to accept changes to their working conditions and contracts.
在后者中,某些人会最终被淘汰,还有一些则会接受他们工作状况和工作合同的更改。
Creating a repository workspace is the first step she needs to make in order to accept changes from the team and deliver changes to her team.
创建存储库工作区是她从团队接收更改和向团队交付更改所需做出的第一步。
What is crucial in this environment is to understand which stream in UCM will accept changes from multiple developers for integrating changes.
在这种环境下什么是至关紧要的,就是了解ucm里的哪一种流将会接收来自不同开发者的变更,并集成这些变更。
If you have conflicting changes, you must then manually resolve the remaining conflicts by selecting a version of a model from which to accept changes.
如果你有产生冲突的变化,那么你必须手工解决剩下的冲突,选择接受哪一个版本的模型的变化。
But if there are conflicting changes, you must manually resolve the remaining conflicts by selecting a version of a model from which to accept changes.
但是如果有冲突性的变更存在,那么您就必须通过选择接受变更的模型的版本,来手动解决剩余的冲突问题。
Lack of attachment is detachment, which equals to inner freedom and the ability to make and accept changes, take advantage of opportunities and adopt new habits.
执着的缺乏就是超然,相当于内心的自由和创造和接受改变的能力,抓住机遇和采纳新的习性。
Formerly, it is the big fish that eats the small one; while now, it is the fast fish that eats the slow one. Therefore, we should have the mentality to accept changes and keep improving.
以前是大鱼吃小鱼,现在是快鱼吃慢鱼,所有我们要有接受变革不断完善的心态。
The restored domain controller itself will accept changes from other remote domain controllers that originated on the remote domain controllers and on the domain controller before it was restored.
还原后的域控制器本身将从其他远程域控制器接受源自远程域控制器上以及源自还原之前该域控制器上的更改。
Not all Arians will be in a position to accept such radical changes.
不过,不是所有的羊儿有能力接受这种剧烈变化。
Our ability to accept and acknowledge changes in our revenue or earning potential outpaces our ability to be clear about costs.
我们接受收入或收益潜能变化的能力超过了我们对成本的理解能力。
The concern was that the farmers would be reluctant to accept the proposed changes because, ultimately, these would reduce the design standards for water supply to the farms.
人们的关切是,农民可能会不愿意接受建议的变化,因为它们最终会降低农民的供水设计标准。
Policy makers need to accept that societies won’t make drastic changes to address climate change until such a crisis hits.
政策制定者们需要接受,在气候变化尚未给人类带来重创之前,社会不会做出重大变化。
Policy makers need to accept that societies won't make drastic changes to address climate change until such a crisis hits.
政策制定者们需要接受,在气候变化尚未给人类带来重创之前,社会不会做出重大变化。
Once you decide to accept the changes that have highlighted potential conflicts, your repository workspace will contain conflicts that have to be resolved.
一旦您决定接受标记出潜在冲突的变更,您的存储库工作区中就将包含必须解决的冲突。
Sometimes you may want to accept the incoming changes before proceeding with your modifications and other times you may decide to wait and integrate later.
有时候您可能想要在继续修改之前接受引入的变更,而有时候您可能决定等待并在之后进行集成。
What we now accept is that the medium changes the nature of what, and how, we communicate.
而我们现在知道,媒体改变了我们沟通的内容和方式。
The change is so drastic that your entire body including your brain simply refuses to accept these changes.
这种改变太过于激进,以至于你的身体,包括你的大脑都难以一下子就能够接受。
Have you ever worked for a manager who found it difficult to accept the changes that the organization had initiated?
您曾经为这样的管理者——很难接受组织已经启动的一项变革——工作过吗?
Hopefully you will evolve in the same direction or at least embrace and accept the changes in the other person.
希望你们可以变化的方向相同,至少可以接受彼此的变化。
Nothing special has to be done, you just accept the incoming changes.
没什么特别要做的,您只需接受引入的变更。
And the last checked out version (1.4 on the enterprise stream) becomes the local version that will accept the changes and be checked back in as version 1.5.
最后一次检出的版本(企业流程上的1.4)成为会接受变更并检回自版本1.5的本地版本。
The repository manager ACTS as chief librarian to accept and review requests for changes, additions, or rearrangement of the core repository structure.
存储库管理员充当图书馆馆长的角色,接受对核心存储库结构的更改、添加或重新排列的请求并进行审批。
It would suggest Britons were too individualistic, too busy with day-to-day living on a crowded island, to accept jarring changes for the common good.
这可能表明不列颠人太个人主义了,太忙碌于在这个拥挤的岛上讨日常生活了,以致不能接受在公共物品方面的震荡性变革。
It would suggest Britons were too individualistic, too busy with day-to-day living on a crowded island, to accept jarring changes for the common good.
这可能表明不列颠人太个人主义了,太忙碌于在这个拥挤的岛上讨日常生活了,以致不能接受在公共物品方面的震荡性变革。
应用推荐