一般地说，当文件的内容有分支时就会出现冲突，这是有相同公共原始内容的文件的两个状态，两种状态都想要在存储库工作区中被接受。
More generally though, conflicts can happen whenever a file is forked, that is two states of the file have the same common ancestor, and both states want to be accepted in a repository workspace.
这些都是公共的约定俗成，比如如果分支值省略了，就是默认为真，所以上面的代码可以这样写。
That idiom is so common, that if the switch value is omitted, it is assumed to be true. So the above could be rewritten as.
我们与公共电视网的分支机构WLIW-21电视台以及‘健康心智”节目的合作，是想在全国范围内，提高公众对自己精神状况的意识。
Our partnership, with PBS's affiliate WLIW-21 and the 'Healthy Minds' programs, offers the potential, on a national scale, to increase viewers' awareness of psychiatric conditions.
“科学共同体”的教育及公共关系分支往往声称这是所有所有真正的科学家途径。
The educational and public relations branch of the science establishment often claims that this is the approach of all true scientists.
这个专业的毕业生将在专业的或教育方面的剧院，电影及广播表演，或者在公共关系领域的其它分支中谋求职位。
Graduates of this program may enter a career in professional or educational theater, film or broadcast performance, or various branches of the public relations field.
在离公共区有一定距离的地方，建筑向着场地伸出几个分支，不同的单元抓住了白天不同的光线。
At some distance from the public area, the building branches out on the land and the various units capture the different lights of the day.
本文认为，区域公共管理研究是公共管理学科的分支领域。
This article thinks that regional public management research is the offset domain of public management.
运用保角变换和等值渗流阻力推得分支水平井（有公共点或没有公共点）产能公式。
The productivity formulas of branch horizontal wells which have or not have common joint are derived by applying conformal transformation and isopleth map of percolation resistance force.
现代意义上的公共管理学是在公共行政学基础上扩展、延伸形成的一门新的边缘性分支学科。
The contemporary public management, which evolves from the science of public administration, is developing as a new frontier and branch science in the world.
在几乎所有国家中，医疗保障的大部分支出都由公共财政支出负责。
In almost all countries, public expenditure accounts for the majority of health-care spending.
建立于2002年4月25日的环境健康学院(EHI)是公共健康部的研究分支，致力于保障环境公共健康。
Officially launched on 25th April 2002, environmental health Institute (EHI) is the research arm within the Division of public health and is dedicated to safeguarding environmental public health.
公共利益药品中心组织位于纽约，受到药品行业的部分支持。
The Center for Medicine in the Public Interest is a group in New York supported in part by the drug industry.
公共利益药品中心组织位于纽约，受到药品行业的部分支持。
The Center for Medicine in the Public Interest is a group in New York supported in part by the drug industry.
应用推荐