开始的目录。这些目录仅仅是已存在主线目录的分支版本。

These directories are merely branched versions of the existing mainline directories.

youdao

有分支版本的文件。这些文件属于另外一个不同的工作目录而不是属于本地的父目录。

A file that has been switched. These are files which belongs to a different working copy than their local parent directory.

youdao

比如说，从‘更正’分支到‘开发’分支的反向整合总会带来冲突，即使开发分支版本从来没有进行过修改。

For instance, back integration from a 'correction' branch to the 'development' branch always brings up a conflict, even though the development branch version was never modified.

youdao