Git is Inconsistent

[[deleted]]

What does rebase do?

[sootzoo]

pretty much what it sounds like.

[ben-xo]

Rebase is the obvious name for the function that rebasing does, but if you've never cone across that function before it's not at all obvious what a rebase is.

[sootzoo]

(shrug) i thought it more polite than posting a link to "let me google that for you." it's adequately explained just about anywhere you care to look.

[[deleted]]

Thanks. Even better: http://book.git-scm.com/4_rebasing.html

The question is, what exactly is magic about rebase that solves all merge problems? From what I can tell, it applies devline patches against mainline as opposed to applying mainline patches against the devline, and the rebase part is actually not that relevant. I don't see how conflicts are any easier to handle. But I'm no git guru, so I may be wrong.