Git Merge: How It Works

Git is a CRDT, it's not the same as a Git merge. The thing that we call merge and Git, which is so painful, is actually not a merge. So performing a Git merge creates a new commit. That's an update. That's creating a new historical record. And now that you've created that, you can push, which is a merge in the opposite direction. What's actually happening is the interpretation of what this history means now has been called into question because you've got concurrent edits. It's perfectly fine to have two different commits that point back to the previous commit. You're okay with a tree then that two facts could be pointing back to the