I’ve since began using rebase to keep the git history linear when merging a feature branch and things are much cleaner now. But the original history of the repository is an absolute mess. We’re currently preparing for an open source release and so I’m going through polishing things like this before its getting shared with a much wider audience and this becomes way more disruptive of a thing to fix. The history looks like this: