We observe a striking shift away from a labour theory among all mainline economists.
我们发现在所有主流经济学家中出现了一种背离劳动理论的惊人变化。
主干是我们的主线。
Trunk: Used for mainline development.
主干：用于干线开发。
Example: New code is checked in to the mainline.
例：新的代码检入到主线中。
To get this fix into the mainline, there are two options.
想要在主线中修复它，有两种选择。
Here's a sample chapter that covers most of mainline model.
这是一个样章，其中讲述了主线模型的大部分内容。
Techniques to merge changes back to the mainline (trunk)
将变更合并回干线（即主干）的技巧
Example: Team a notices that the mainline has been updated.
示例：团队A注意到主线已经更新了。
Native Kernel AIO support is included in the mainline 2.6 kernel.
主流 2.6内核中包括了对本地KernelAIO 的支持。
Branches: Used to maintain software outside mainline development.
分支：用于维护干线开发之外的软件。
We had about 6 successful merges of forks back to the Cells mainline.
我们有6个成功的分支合并到主线上。
Team a has an active work branch that was spawned from the mainline.
团队A有一个衍生自主线的活跃工作分支。
Almost everyone said they liked "mainline" Protestants, Jews and Catholics.
几乎所有人都说他们喜欢“主流”的新教徒，犹太教徒和天主教徒。
Example: Team B merges to mainline only when a story is complete and tested.
例：团队B只有在一个故事完成并通过测试后才能向主线合并变更。
The process of CI is typically run against the repository's mainline: the trunk.
通常CI过程都是根据储存库的干线（即主干）而运行的。
That should immediately be merged down to R2.4, and merged from there down to mainline.
这应该立即合并到2.4版本中，并将其合并到主线上。
Instead, changes in team A work should flow to the mainline and then down to team B work.
实际上，在团队A工作分支中发生的变更应该流回到主线中，再向下进入到团队B的工作分支中。
As soon as Team a development branch reaches a stable point they copy back up to the mainline.
只要团队A的开发代码线达到稳定的一个点，他们就可以将代码复制回主线。
Finally, Ceph is open source distributed storage and part of the mainline Linux kernel (2.6.34).
最后，Ceph是开源分布式存储，也是主线Linux内核(2.6.34)的一部分。
One of the primary reasons to create a branch is to prevent disruption to mainline development.
创建分支的主要原因之一就是防止中断干线开发。
If you remember one thing, remember that all roads should lead back to the mainline - eventually.
如果必须记住一点的话，那就是一切最终都要回到主干。
One set of developers can work on the version 1.0.1 branch while others develop off the mainline.
可以是一组开发人员在版本1.0.1分支上进行开发，而其他人员在干线上开发。
At this point we build again, but this time on an integration machine based on the mainline code.
我需要再次构建，但这次是在一台拥有主线代码的集成机器上进行。
Although Ceph is now integrated into the mainline Linux kernel, it's properly noted there as experimental.
虽然Ceph现在被集成在主线Linux内核中，但只是标识为实验性的。
The Linux KVM is the first virtualization technology that has been integrated into the mainline Linux kernel.
LinuxKVM是第一个集成到主流 Linux内核中的虚拟化技术。
When a team develops in parallel, it's important to merge code back to the mainline (trunk) as often as feasible.
团队进行并行开发时，一定要以最高的频率将代码合并回干线(即主干)。
File capabilities are currently implemented in the -mm kernel tree, and are expected in the mainline kernel by 2.6.24.
文件能力特性当前是在-mm内核树中实现的，有望在2.6.24版中被包含在主线内核中。
ReiserFS was introduced in 2001 in the mainline 2.4 kernel (the first journaling file system to be adopted by Linux).
ReiserFS于2001年被引进到主流2.4内核(Linux采用的第一个日志文件系统)。
Merge the schema change script into the mainline as 01.00.0046, and fix the 2.0 baseline script to incorporate this change.
将数据库变更脚本合并到当前主线版本01.00.0046的脚本中，并在基线版本2.0中进行相应的修复来处理这一变更；
Many words have been said about the relationship between the Android project and the mainline kernel development community.
关于Android项目和内核主分支开发社区的关系，已经谈论得够多了。
应用推荐