3 ms·
Rebasing gives you a linear history instead of the diamonds non-rebased branching and merging gives you. I mean, that's the technical reason, anyway.
by jdmichal 10y ago
Rebasing gives you a linear history instead of the diamonds non-rebased branching and merging gives you. I mean, that's the technical reason, anyway.
- BeetleB 10y agoBut that's what I'm trying to understand: The branched history was never a problem for me (although I do use a GUI for it).
- __david__ 10y agoFor 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.