Rule: Merge from trunk to your work branch every day.
规则：每天都从主干向你的工作分支中合并代码。
Every few weeks you want to merge from the branch into the trunk.
隔几周你就想将分支合并到主干上一下。
Frequently you want to merge from the same origin to the same target multiple times.
你经常都会要从同一个源合并到同一个目标很多次。
1 cannot merge from your mail merge list. Your mail merge list may be damaged or invalid.
无法从邮件合并列表合并。您的邮件合并列表可能已损坏或无效。
Rule: Merge from your work branch to the trunk on a regular basis, for example whenever a story is done.
规则：经常从工作分支向主干合并代码，例如每完成一个故事之后。
Merge from one branch to another, a conflict can occur between the version of the file in the source branch and the version of the file in the target branch.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
If you received a license file from IBM to unlock an additional feature, you must merge the content of the new license file with the existing one.
如果您从IBM接受一个许可证文件以对附加功能解锁，那么您必须将新许可证文件的内容与已存在文件的内容相合并。
The government's avowed aim, however, is to maintain "a substantially homogeneous society into which newcomers, from whatever sources, will merge themselves".
然而，政府公开宣称的目标是保持“一个实质上同质化的社会，无论出身何处的新来者都将融入其中”。
Merge down the latest from the work branch, and check in your code.
从工作分支中取得并合并最新的代码，然后检入你的代码。
This allows you to take data from two different source fields and merge them into a single target field.
这允许您从两个不同的源字段获取数据并将它们合并到一个目标字段中。
In Listing 2, I use a classical merge algorithm to merge the lists from both documents.
在清单2中，我使用传统的合并算法合并来自两个文档中的列表。
Depending on the comparison between the merge criteria from the documents, I either copy events from document 1 to the output document or from document 2 to the output document.
通过比较来自两个文档的合并条件，决定从文档1还是文档2复制一个事件到输出文档。
If the black holes in a binary system merge, then an even stronger pulse of gravitational waves radiates away from the system.
如果双黑洞结合在一起，那么更强的引力波脉冲波将从这个双黑洞的二元体系辐射开来。
There is no visualization or harvesting of models from existing source code — and without a merge as identified previously, there is certainly no notion of round-trip engineering.
如果没有对已有源代码的可视化或者获取模型的—并且没有对之前被识别的代码进行合并，就不会有双向工程的概念。
You could then merge these offline Workspaces back, in their entirety, into the child that spawned from.
然后您可以合并这些离线工作区，到扩展的子类中。
They can make changes, commit them to their local repositories, and merge changes from others without affecting the main branch.
开发人员进行变更、提交变更到其本地的存储库，之后，在不影响主干的前提下，与其他开发人员的变更合并。
That would mean forcing Greece’s biggest banks to merge, recapitalising them with funds from the EU and IMF and putting them under state control.
这意味着将迫使希腊的银行巨头们合并，由欧盟和货币基金组织注资重组，使之国有。
Merge data from multiple sources
合并来自多个源的数据
Do not commit changes (from a branch merge) to the trunk which may break it?
不要提交一些可能破坏trunk的内容，例如从branch合并。
Eclipse retrieves any changes from the repository and attempts to merge them with your local copy.
Eclipse将从存储库中检索任何变更，并尝试将它们与本地副本合并。
You can merge interfaces or move operations from one interface to another, and you can also merge components in the assembly editor.
您可以合并界面，或者将操作从一个界面移动到另一个界面，并且还可以在Assembly Editor中合并组件。
A relevant segment of the updated plugin-cfg.xml file is shown in Figure 13, which shows a merge of the members from Cluster1 and Cluster2 to create a super cluster.
图13展示了更新后的plugin-cfg.xml文件中的有关部分，它将来自Cluster1和Cluster2 的成员合并在一起来创建一个超级集群。
In the example, Information Integrator is used to merge data from file system records, Oracle, and DB2 data sources.
在此例中，Information Integrator用于合并来自文件系统记录、Oracle和DB 2数据源的数据。
When the original task becomes unblocked, the developer can resume the original work (and merge in the changes from the original task, if required).
当原始任务不能锁定时，开发员就可以恢复原来的工作了（如有需要，还有来自原始任务更改的合并）。
A merge element then brings both the yes and no outputs from the decision back to one single path.
然后一个合并元素将该决策的Yes和No输出带回到一条单一路径。
That termed Phi Crystals, or Presently termed Vogel Phi Crystals were used extensively to merge energy from 'human theta thought' via teams of Atla-Ra Scientist-Priest.
这被称为Phi水晶，或目前称为Vogel Phi水晶透过ATLA- RA科学家祭司团队被广泛地应用于合并「人类西塔 THETA思想」。
RequisitePro will detect the changes made to the document by the Microsoft Word merge process (Figure 22. RequisitePro detects changes from outside).
RequisitePro将会检测到MicrosoftWord合并文件过程对文档所做的变更（图22，“RequisitePro检测到来自外部的变更”）。
At least one of the incoming branches of the merge must come from outside the cyclic process fragment, or this process fragment could not be reached from other activities.
merge必须至少有一个传入分支来自循环流程片断的外部，否则将无法从其他活动到达此流程片断。
This means that every decision should eventually be followed by a matching merge, which combines all the paths starting from the decision.
这意味着，每个decision最终都应跟随一个匹配的merge，并由后者组合从decision开始的所有路径。
This means that every decision should eventually be followed by a matching merge, which combines all the paths starting from the decision.
这意味着，每个decision最终都应跟随一个匹配的merge，并由后者组合从decision开始的所有路径。
应用推荐