Home >  Term: Conflict
Conflict

(1) In a compare or merge session, the result when two contributors have changes that cannot both be accepted.
(2) A result that occurs when two simultaneous edit submissions are processed for the same object and where the intended outcome of the edit is unclear.

0 0

Kūrėjas

  • Harry8L
  • (London, United Kingdom)

  •  (V.I.P) 574128 points
  • 100% positive feedback
© 2026 CSOFT International, Ltd.