一般地说，当文件的内容有分支时就会出现冲突，这是有相同公共原始内容的文件的两个状态，两种状态都想要在存储库工作区中被接受。
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.
Hill一般看到的职位描述只是简单说明了日常的工作内容及角色就了事。
Hill regularly sees JDs which simply mention the duties of a role and nothing else.
普通人的工作任务是完成某一项具体工作，一般来说内容比较单一，标准也比较明确。
Ordinary tasks is to accomplish a specific task, in general, the content is relatively simple, standards are relatively clear.
在一般情况下，如果你想从别人的工作作出实质性的内容报价。
In general, If you are going to make a substantial quotation of content from somebody's work.
一般来说，大部分的实习工作内容都会包括一定量的文书工作，而同时，实习生期待完成比那些文书工作更有技术含量的工作也是正常的。
Some amount of clerical work is normal in most internships, and it's not uncommon for interns to come in expecting to do more glamorous work than what they end up with.
一般是根据工作总结的中心内容、目的要求、总结方向来定。
Is generally based on summing up the work of the center contents, purpose, direction to set up.
围绕该方法的内容有蒙特卡罗仿真方法的数学基础、蒙特卡罗方法的一般工作流程、一次快照的四个关键步骤以及仿真的收敛标准。
The contents of which related to the mathematical foundations of the Monte Carlo simulation method, its general work flow, the four key steps of a snapshot and the convergence criteria of simulation.
地质编录与测绘是重要水利水电工程施工地质工作的一项主要内容，一般地质编录测绘需要完成工程地质图图幅。
Geological recording and plotting is one of the main tasks in the construction geology of water conservancy projects.
一般说，工作总结的标题由工作总结的单位名称、工作总结的时间、工作总结的内容或种类三部分组成。
In general, summing up the work of the title by summing up the work of the unit name, summing up the work of the time, the work of summing up the contents or class is composed of three parts.
考务管理工作是高校教务管理工作的重要内容，在考务管理系统中，一般通过手工录入数据，效率比较低，很容易出错。
To speed up the reform process of the educational administration of colleges and universities, an information system of test management is developed with advanced information technology.
考务管理工作是高校教务管理工作的重要内容，在考务管理系统中，一般通过手工录入数据，效率比较低，很容易出错。
To speed up the reform process of the educational administration of colleges and universities, an information system of test management is developed with advanced information technology.
应用推荐