稍后，由合并操作将更改从一个分支迁移到另一个分支(或主干)。
Later, moving changes from one branch to another branch (or the main trunk) is performed by the merging operation.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
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.
然而，通过对蝾螈族谱的详细分析，我们可以清楚地看到，其他谱系分支是从一个本身已经失去了变形的能力的祖先演化而来的。
From a detailed analysis of the salamanders' family tree, however, it is clear that the other lineages evolved from an ancestor that itself had lost the ability to metamorphose.
应用推荐