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.
- Part of Speech: noun
 - Industry/Domain: Software
 - Category: Globalization software service
 - Company: IBM
 
 			0   			 		
 Creator
- Peteh
 - 100% positive feedback