一般地说，当文件的内容有分支时就会出现冲突，这是有相同公共原始内容的文件的两个状态，两种状态都想要在存储库工作区中被接受。
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.
应用推荐