Is this statement correct?
The difference between a "diff" and a "conflict" in Git is that a "diff," meaning "difference," is merge-able. There's been a singular change to a line of code and it's just a matter of updating that file. A "conflict" is a deal breaker. You've got more than one change being made on the same line of code and in that instance, you have to manually inspect that line and choose what code you want to use going forward.