For me I dislike branched history because each merge point can (accidentally) have extra non-merge code added and therefore should technically be code-reviewed,

For me I dislike branched history because each merge point can (accidentally) have extra non-merge code added and therefore should technically be code-reviewed, too. Git doesn't like showing merge commit diffs (even with `git log -p`) and so it's not easy to see how someone resolved their merge conflicts. I don't find that diamond branch development technique adds much in the way of useful information, so I tend to try to keep it linear.