What's the Difference Between a Conflict and a Concurrent?

In git, there are no branches. They're just pointers to a commit. And get where you have two people who've both done a commit to the same branch, and now you're in a situation where you are going to have emerge conflict. The simple fact of two different commits having the same parent, that is the thing that represents a concurrent change. A concurrent to a pair of commits. So neither one of them knows about each other, but they both have some common ancestor. There is no conflict there at all.