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.
一般地说，当文件的内容有分支时就会出现冲突，这是有相同公共原始内容的文件的两个状态，两种状态都想要在存储库工作区中被接受。
Forked or divided into two parts or branches, as the Y-shaped styles of certain flowers.
分叉的分为两部分或两枝的，如某些花的丫型花柱。
For these common problems in mechanical machining, special fixtures for two special parts, a forked part and a steering joint, were designed and accordingly two proper processes were introduced.
针对上述一般机械加工中常见的问题，本文介绍了某叉形零件和转向管接头车削专用夹具的设计和适用于大、中型孔的两种加工方法。
The conjugate CAM, a forked swing link and two rollers fixed on the forked swing link form a conjugate CAM mechanism.
共轭凸轮、叉形摆杆和固定在叉形摆杆上的两个滚子组成共轭凸轮机构。
The conjugate CAM, a forked swing link and two rollers fixed on the forked swing link form a conjugate CAM mechanism.
共轭凸轮、叉形摆杆和固定在叉形摆杆上的两个滚子组成共轭凸轮机构。
应用推荐