This means your engineering team has terrible communication skills.
me and my teammate both edited the same function and now there's a merge conflict
+947
Definitions of Merge Conflict
1 definitionThink they got it wrong?
Add your own definition of Merge Conflict