if you feel like merge commits are "ugly" -- why do you feel that way? what's confusing about them? what tasks are harder to do? what questions are harder for you to answer? (I kind of feel confused about merge commits too and it's hard for me to explain why, I can definitely see that there are a lot of advantages to the merge workflow)
@b0rk Big one for me is that if you find yourself needing to rebase the branch with merge commits in it (for instance, when you need to remove a commit from the history which has blown up the size of the repo unnecessarily - accidental binaries or something - or remove private data), there's a chunk more complexity to get through those merge commits.
But, not-technical but philosophical, I just _like_ one history branch after merging. It makes me more comfortable to look at.
