[_ouxp]

If you have a reasonably good+fast test suite and you integrate often, this isn't a huge deal. Just run your tests after using rebase.

If you have a failure, having a straight-line history makes it easier to do a bisect with your failing test and find the point of failure.

Unrelated to your issue with git rebase, but addressing another common complaint, git rerere allows git to remember and reuse previous conflict resolution so you don't get into resolution hell.

[golergka]

Unfortunately, I work on a project that (due to a various reasons) doesn't have any kind of automated testing, and it would be pretty hard to implement it. (But possible, and we definitely should do it in the future).

But thanks for git rerere! I've never heard about it.