A striking or dashing together; violent collision; as, a conflict of elements or waves.

A strife for the mastery; hostile contest; battle; struggle; fighting.

To strike or dash together; to meet in violent collision; to collide.

To maintain a conflict; to contend; to engage in strife or opposition; to struggle.

To be in opposition; to be contradictory.

Is where two parties perceive resistance to them achieving their goals. A certain level of conflict is required for organisations to function effectively.

perceived rival and incompatible claims over some desired "good"

A broad term regarding an interaction between people with differing interests which are perceived as incompatible. Derived from the Latin conflictus, meaning "to strike together." Conflict is often inevitable, but constructive outcomes from conflict are frequently possible. Conflicts involving a definable number of parties are usually referred to as disputes, which differ substantially from large scale conflicts that arise between entire population groups, i.e. ethnic or national.

(KON-flict): A serious disagreement. A conflict can also be a period of fighting.

inter-human conflicts consist of disagreements between two or more parties that have the potential to inflict harm upon one, both, or all of the parties involved.

a disagreement or argument about something important; "he had a dispute with his wife"; "there were irreconcilable differences"; "the familiar conflict between Republicans and Democrats"

a fight or quarrel

The condition that exists when a file has changed in both the child and parent workspace. Conflicts are identified by the Bringover Update transaction and are resolved by using the Resolve transaction.

a valid state of a repository

When two developers make changes to their working copies of the same file and commit them to the repository, their work may conflict. When this happens, CVS will detect the conflict and require someone to resolve resolve it before committing their changes.

Sometimes, when you update your files from the repository, you may get a conflict. A conflict occurs when two or more users have changed the same few lines of a file.

a set of assumptions, the conjunction of which is inconsistent with the

A situation that arises when changes are made to the same directory data on different directory servers before replication can synchronize the data between the servers. When the servers do synchronize, they detect that their copies are inconsistent, and may resolve the conflict or log an error.

A set of Assignment s to Assumption Variable s that, if made, would imply inconsistent values for the same Variable.

In Cloudscape synchronization, a change submitted by a target database that, if allowed to apply at the source, would corrupt the data.