merge conflict
situation resulting from conflicting information in different versions of a code base
--Agreed Upon Solutions

The discussion does not exist would you like to add the first comment?

anonymous