> It's really hard to track, especially on the CLI.

    git log --first-parent --max-parents=1

Now you don't see merge commits.

Forbid merge commits with conflict resolution, and you're done.