- afflict [from ad- 'to' + fligere 'to hit'] affect sb/sth in an unpleasant way, and make them suffer
- conflict [Origin: 过去分词 of confligere 'to strike together', from com- + fligere 'to hit/strike']
- inflict [Origin: 过去分词 of infligere, from fligere 'to hit'] make someone suffer something unpleasant
Conflict in literature refers to the different drives of the characters or forces involved. Conflict may be internal or external - that is, it may occur within a character's mind or between a character and exterior forces, (or point(s) of view). Conflict is most visible between two or more characters, usually a protagonist and an antagonist/enemy/villain, but can occur in many different forms. A character may as easily find himself or herself in conflict with a natural force, such as an animal or a weather event, like a hurricane. The literary purpose of conflict is to create tension in the story, making readers more interested by leaving them uncertain which of the characters or forces will prevail.
- In revision control, a conflict is a problem wherein multiple editors attempt to edit the same document.
- git使用 - 冲突conflict的解决演示
- sloc /slɔk/ source lines of code. 源代码 (source code). 机器码 (machine code). 从某种意义上说，源代码和机器码的功能一样，如都是个象棋程序。再说它们都是code. 所以：代码的源(代码)的行(们)。:-)
In social science, conflict may refer to:
- Conflict (process), the general pattern of groups dealing with disparate ideas
- Conflict continuum from cooperation (low intensity), to contest, to higher intensity (violence and war)
- A continuum is a set of things on a scale, which have a particular characteristic to different degrees.
- Conflict of interest [利益], involvement in multiple interests which could possibly corrupt the motivation or decision-making
- Cultural conflict, a type of conflict that occurs when different cultural values and beliefs clash
- Ethnic conflict, a conflict between two or more contending ethnic groups
- Group conflict, conflict between groups
- Intragroup conflict, conflict within groups. intra-. inter+national=international
- Organizational conflict, discord caused by opposition of needs, values, and interests between people working together
- Role conflict, incompatible demands placed upon a person such that compliance with both would be difficult
- Social conflict, the struggle for agency or power in something
- Work-family conflict, incompatible demands between the work and family roles of an individual
六级/考研单词: affection, inflict, interior, hurricane, tense, uncertain, prevail, revise, multiple, edit, cooperate, contest, corrupt, motive, clash, ethnic, contend, nationwide, discord, struggle
标签：different,code,conflict,groups,between,Conflict From： https://www.cnblogs.com/funwithwords/p/16585250.html