Rule: Merge from trunk to your work branch every day.

规则：每天都从主干向你的工作分支中合并代码。

youdao

Every few weeks you want to merge from the branch into the trunk.

隔几周你就想将分支合并到主干上一下。

youdao

Frequently you want to merge from the same origin to the same target multiple times.

你经常都会要从同一个源合并到同一个目标很多次。

youdao

In other words, it is to bring the rigor, the substance, the empirical foundation, the science from academia and merge it with accessibility of the self-help or New Age movement.

换句话说，就是要把严谨，实质，经验基础，学术科学,与自助或新纪元运动的通俗易懂相结合。

哈佛公开课 - 幸福课课程节选

New video-processing chips, meanwhile, let agents merge images from infrared cameras with regular video.

FORBES: Spotting Evil

The department said the profile was backdated to 2008 to avoid having to merge data from an old IT system and a new one.

BBC: Guernsey health profile released

The pressure to merge is coming from Europe's looming single currency, the euro.

ECONOMIST: Italian banking