Comment by hedora

Merge breaks your history. Most people start where you are, then eventually realize that merge is actually non-understandable, and switch to rebase.

Hint: “git rebase -i HEAD~3” is your friend. So is “git bisect”.