Blockchain means there is also a consensus mechanism. That’s the whole point: resolving conflicts.

Git is basically a Merkel Tree, but not a blockchain.