Merge down the latest from the work branch, and check in your code.
从工作分支中取得并合并最新的代码,然后检入你的代码。
Where the towns meet and merge there's plenty of space for people who want to take time to decide, or indeed to settle down and never need to, because the truth is that there is no fence.
而在这些边缘地带,有许多小镇聚集、融合,无论是需要时间去做决定的人、确实想定居下来的人还是无需考虑的人都有其足够的容身之处——因为那里不会有围栏。
They merge the changes down to their development branch and fix any conflicts.
他们将变更向下合并到自己的开发代码线,并修复任何冲突。
At that stage we can merge these, and then take this down, do the division merge and bring them back up.
在那里做一次分解,做到这步时,我们可以把这些进行合并,然后把这个拿下来,做分解合并过程后再把它们拿回去。
Down here, I've just got two things to merge, and then I've got things of size two to merge and then things of size four to merge. But notice a trade off. I have n operations if you like down there of size one.
但是n的大小是不同的,是吗?在这里我们只要合并两个元素,然后是合并长度为2的列表,接下来是合并长度为4的列表,但是观察一下之间的权衡关系。
应用推荐